Commit Graph

1379 Commits

Author SHA1 Message Date
rahul shukla 24faf854c5 up-sellling completed 2019-03-05 15:16:17 +05:30
rahul shukla ab9bf8ea97 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-04 10:11:39 +05:30
rahul shukla ca39b84d0b upsell product 2019-03-04 10:11:24 +05:30
JItendra Singh 2c3d1d1096
Merge pull request #641 from prashant-webkul/development
Development
2019-03-01 11:08:37 +05:30
Prashant Singh 62f8cf1bad Fixed issue #642 2019-03-01 11:05:56 +05:30
JItendra Singh da73d59853
Merge pull request #643 from jitendra-webkul/jitendra
ACL issue fixed
2019-03-01 11:01:11 +05:30
jitendra e099492fd9 ACL issue fixed 2019-03-01 11:00:15 +05:30
Prashant Singh 543af40328 Issue in shipments grid is fixed 2019-02-28 16:29:46 +05:30
Prashant Singh d84cf69661 Fixed the issue #620 2019-02-28 16:24:10 +05:30
Prashant Singh ccea6689f1 address card list issue fix 2019-02-28 10:54:10 +05:30
Prashant Singh e2facbc329 All the color values have been converted into variables for shop package 2019-02-28 10:37:21 +05:30
Prashant Singh 96dc1bd28c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-28 10:17:20 +05:30
JItendra Singh 674639a008
Merge pull request #640 from jitendra-webkul/jitendra
Jitendra
2019-02-27 20:30:44 +05:30
jitendra 876041aee4 Issue #639 fixed 2019-02-27 20:30:07 +05:30
jitendra efa2dd143b Issue #638 fixed 2019-02-27 20:10:04 +05:30
jitendra d05edec01e Color swatch issue fixed 2019-02-27 20:09:21 +05:30
JItendra Singh 56a413c37b
Merge pull request #637 from jitendra-webkul/jitendra
Shipment grid issue fixed
2019-02-27 19:18:07 +05:30
jitendra cceed7d048 Shipment grid issue fixed 2019-02-27 19:17:13 +05:30
JItendra Singh 6bb736557a
Merge pull request #635 from abdulhamid-alattar/master
fixing the issue #633
2019-02-27 16:40:32 +05:30
JItendra Singh 73a3654773
Merge pull request #634 from jitendra-webkul/jitendra
Front review date format changed
2019-02-27 16:29:48 +05:30
jitendra ff37ad3c58 Front review date format changed 2019-02-27 16:29:03 +05:30
Abdulhamid Alattar 65a9e36473 fixing the issue #633 2019-02-27 14:50:35 +04:00
Prashant Singh 1ac6496fbc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-27 14:47:08 +05:30
JItendra Singh 268ec5e425
Merge pull request #632 from prashant-webkul/development
Development
2019-02-27 14:46:24 +05:30
Prashant Singh 23d17a44b8 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-27 14:30:12 +05:30
Prashant Singh bd5c88a29e eventbus events on checkout onepage 2019-02-27 14:28:50 +05:30
JItendra Singh 8da0ba56c9
Merge pull request #631 from jitendra-webkul/jitendra
Jitendra
2019-02-27 13:09:11 +05:30
jitendra 570442ad3e Fixed cart controller issue 2019-02-27 13:07:27 +05:30
jitendra d7d8eb31a8 Increased datagrid deafult pages limit to 15 2019-02-27 12:27:07 +05:30
JItendra Singh a9b13951da
Merge pull request #630 from jitendra-webkul/jitendra
Product grid item per page increased to 20
2019-02-27 12:03:33 +05:30
jitendra e5f1abe7a9 Product grid item per page increased to 20 2019-02-27 12:02:48 +05:30
JItendra Singh 3fd2a5423e
Merge pull request #629 from jitendra-webkul/jitendra
convertToBasePrice function added to Core class
2019-02-26 19:09:33 +05:30
jitendra 01f3cd7324 convertToBasePrice function added to Core class 2019-02-26 19:07:51 +05:30
JItendra Singh 1287d1065f
Merge pull request #628 from jitendra-webkul/jitendra
convert price function issue fixed
2019-02-26 18:46:41 +05:30
jitendra 1ce5a957f9 convert price function issue fixed 2019-02-26 18:45:55 +05:30
Prashant Singh c5aceb72d0 event bus events added in onepage checkout for shipping and payments 2019-02-26 18:24:38 +05:30
Prashant Singh 91e1054085 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-26 18:21:55 +05:30
JItendra Singh 2d72a5013b
Merge pull request #627 from jitendra-webkul/jitendra
Fixed swatch issue
2019-02-26 14:32:55 +05:30
jitendra 90540d445e Fixed swatch issue 2019-02-26 14:32:18 +05:30
JItendra Singh 3683bf79b6
Merge pull request #626 from rahulshukla-webkul/development
rtl class removal
2019-02-26 14:20:15 +05:30
rahul shukla c02d75774d rtl class removal 2019-02-26 14:18:42 +05:30
JItendra Singh 5a769f22ec
Merge pull request #613 from rahulshukla-webkul/development
Development
2019-02-26 14:15:16 +05:30
rahul shukla 724c81ffd7 conflict resolve 2019-02-26 14:13:07 +05:30
JItendra Singh 2775885b61
Merge pull request #625 from jitendra-webkul/jitendra
Added margin top on pagination
2019-02-26 13:14:59 +05:30
jitendra 71ddbacbd8 Added margin top on pagination 2019-02-26 13:14:18 +05:30
JItendra Singh 7ab9b2d6f7
Merge pull request #624 from jitendra-webkul/jitendra
Issue #588 fixed
2019-02-26 13:07:41 +05:30
jitendra 0f382acbf4 Issue #588 fixed 2019-02-26 13:06:51 +05:30
JItendra Singh 8394fc19ae
Merge pull request #623 from jitendra-webkul/jitendra
Issue #621 fixed
2019-02-26 13:00:35 +05:30
jitendra 4f420ca483 Issue #621 fixed 2019-02-26 12:59:58 +05:30
Prashant Singh 55fe107874 readme 2019-02-26 12:07:23 +05:30