Commit Graph

983 Commits

Author SHA1 Message Date
rahul shukla eb38784f7f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-05 15:16:35 +05:30
rahul shukla 24faf854c5 up-sellling completed 2019-03-05 15:16:17 +05:30
jitendra 1079331358 Conflict fixed 2019-03-05 13:17:58 +05:30
jitendra 4c28aceab5 Product gallery selected thumbnail border color changed to brand color 2019-03-05 13:15:21 +05:30
JItendra Singh f7d8f726f7
Merge pull request #644 from prashant-webkul/development
changed address card class on onepage checkout
2019-03-05 10:55:11 +05:30
JItendra Singh c0dd164345
Merge pull request #648 from jitendra-webkul/jitendra
Excluded image swatch attributes from layed navigation
2019-03-05 10:54:38 +05:30
jitendra 70c4e69aaf Excluded image swatch attributes from layed navigation 2019-03-05 10:53:50 +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
Prashant Singh 54835099ba made the changes in checkout page by applying id attribute for all sections, so it would be easy for js to identify the section and usage of the script accordingly, the primary need was to add the id attribute on the continue button as it was needed for the section validation 2019-03-02 14:01:34 +05:30
Prashant Singh 9df1c291a6 Checkout's payment method front end rendering order function changed from unshift to push 2019-03-01 18:17:21 +05:30
Prashant Singh bce57ed750 changed address card class on onepage checkout 2019-03-01 11:21:53 +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
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 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
JItendra Singh 268ec5e425
Merge pull request #632 from prashant-webkul/development
Development
2019-02-27 14:46:24 +05:30
Prashant Singh bd5c88a29e eventbus events on checkout onepage 2019-02-27 14:28:50 +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 e5f1abe7a9 Product grid item per page increased to 20 2019-02-27 12:02:48 +05:30
jitendra 01f3cd7324 convertToBasePrice function added to Core class 2019-02-26 19:07:51 +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
jitendra 90540d445e Fixed swatch issue 2019-02-26 14:32:18 +05:30
rahul shukla c02d75774d rtl class removal 2019-02-26 14:18:42 +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
JItendra Singh 242b64afbf
Merge pull request #614 from prashant-webkul/development
Development
2019-02-26 11:56:43 +05:30
JItendra Singh c1d890ee56
Merge pull request #622 from jitendra-webkul/jitendra
Option swatches feature added
2019-02-26 11:55:42 +05:30
jitendra 0c84a9dcb2 Option swatches feature added 2019-02-26 11:55:00 +05:30
rahul shukla 35cdb1fd52 rtl css changes for admin 2019-02-25 19:05:45 +05:30
rahul shukla 7cfc0d3710 issue #618 & #619 & rtl css changes 2019-02-25 18:06:18 +05:30