Commit Graph

2835 Commits

Author SHA1 Message Date
Jitendra Singh c2719ac472
Merge pull request #1341 from rahulshukla-webkul/development
issue #1340
2019-08-22 14:18:39 +05:30
rahul shukla 486c6ca63f issue #1340 2019-08-22 13:56:21 +05:30
Prashant Singh 852a6b91af More normalization added in cart rule actions for FixedAmount & PercetnOfProduct 2019-08-22 11:05:25 +05:30
Jitendra Singh 828a76a5b3
Merge pull request #1337 from prashant-webkul/development
Cart rule action PercentOfProduct max discount quantity fixes
2019-08-21 17:51:57 +05:30
Prashant Singh 7a1b73f1c7 Cart rule action PercentOfProduct max discount quantity fixes 2019-08-21 17:26:23 +05:30
Jitendra Singh 5b6b6fbcb0
Merge pull request #1336 from prashant-webkul/development
Development
2019-08-21 16:46:50 +05:30
Prashant Singh 151c7a830a Fixed issues related to empty attribute conditions 2019-08-21 16:10:39 +05:30
Prashant Singh 171b48453e Made cart rule conditions interpreter fault tolerant to missing attributes 2019-08-21 15:22:37 +05:30
Jitendra Singh 7cab5fd630
Merge pull request #1335 from prashant-webkul/development
Development
2019-08-21 15:14:02 +05:30
Prashant Singh 3b61c17155 Fixed issue #1333 2019-08-21 15:07:14 +05:30
Prashant Singh 140820dc4a Fixed issue #1334 2019-08-21 15:03:53 +05:30
Jitendra Singh 305c91554f
Merge pull request #1332 from prashant-webkul/development
Added home page SEO under channel edit and create forms and fixed iss…
2019-08-21 13:40:14 +05:30
Prashant Singh 05c5425c96 Added home page SEO under channel edit and create forms and fixed issue #1319 2019-08-21 13:38:07 +05:30
Jitendra Singh 0ce9b8497e
Merge pull request #1330 from prashant-webkul/development
Fixed issue with category or attribute field left empty
2019-08-21 12:22:03 +05:30
Prashant Singh 3c9ae5b35d Fixed issue with category or attribute field left empty 2019-08-21 12:19:53 +05:30
Jitendra Singh 91b54d36f5
Merge pull request #1329 from prashant-webkul/development
Fixed issue #1324
2019-08-21 11:37:29 +05:30
Prashant Singh ec89315b42 Fixed issue #1324 2019-08-21 11:16:01 +05:30
Jitendra Singh 77f36c00dd
Merge pull request #1322 from prashant-webkul/development
Development
2019-08-21 10:31:21 +05:30
Prashant Singh 56a1fd4593 Fixed issue #1312 2019-08-21 10:17:16 +05:30
Prashant Singh f3b532adef WIP: CMS Pages fix in progress 2019-08-20 19:21:20 +05:30
Prashant Singh 3a9143462e Added asterisk in description fields of catalog rule update and create 2019-08-20 17:27:49 +05:30
Prashant Singh afafdfbfcd Fixed issue #1327 2019-08-20 16:48:11 +05:30
Prashant Singh 2a15488f24 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-08-20 16:47:00 +05:30
Prashant Singh 9d5793b7b5 Fixed issue #1326 2019-08-20 16:25:00 +05:30
Prashant Singh e52825a3f9 Fixed issue #1323 2019-08-20 16:10:24 +05:30
Prashant Singh 07be3c6a86 Fixed issue #1325 2019-08-20 16:07:41 +05:30
Prashant Singh 46e3badf4d Fixed issue #1275, #1321, #1285 2019-08-20 15:56:32 +05:30
Prashant Singh 01b9f5cbbc Fixed issue #1269 2019-08-20 13:33:24 +05:30
Prashant Singh 8cf6c41fc5 Fixed issue #1268 2019-08-20 13:31:59 +05:30
Jitendra Singh fbf5da570e
Merge pull request #1318 from prashant-webkul/development
Development
2019-08-20 12:07:58 +05:30
Prashant Singh 0ea994502d Fixed issues with Carbon instance and applied redirect to catalog rule index after applying rules 2019-08-20 11:46:20 +05:30
Prashant Singh 8744c84eb9 product card hover padding removed 2019-08-20 10:48:17 +05:30
Prashant Singh 9767e479f2 Webfont added 2019-08-19 23:36:52 +05:30
Prashant Singh 313c9b78ff Updated module to latest of the Bagisto 2019-08-19 17:34:29 +05:30
Prashant Singh a29409b1a4 Base sync 2019-08-19 16:11:09 +05:30
Jitendra Singh e5b904741c
Merge pull request #1316 from prashant-webkul/development
Catalog rule implementation complete, new product price mechanish rem…
2019-08-19 15:11:13 +05:30
Prashant Singh e97069d2be Catalog rule implementation complete, new product price mechanish remaining 2019-08-19 15:05:56 +05:30
Jitendra Singh b7bc6344bb
Merge pull request #1313 from prashant-webkul/development
Development
2019-08-19 13:56:04 +05:30
Jitendra Singh 2ce5d52709
Merge pull request #1282 from KarimQaderi/patch-2
ViewRenderEventManager send string template
2019-08-19 13:55:00 +05:30
Prashant Singh 8a9198e5d9 Catalog rules tie break in progress, squased a line of dead code in CartRuleController 2019-08-19 12:36:43 +05:30
Prashant Singh aca7b4c6c7 Catalog rule tie breaker content in progress 2019-08-17 20:18:39 +05:30
Prashant Singh 1d1018ac50 Refactoring of cart rules and syntax standard sugar 2019-08-17 17:40:17 +05:30
Jitendra Singh a8ff894d6c
Merge pull request #1310 from prashant-webkul/development
Fixed channel locale issue in cms datagrid
2019-08-17 15:49:18 +05:30
Prashant Singh bb972c6e48 CMS Bug fixes and updated readme 2019-08-17 15:42:24 +05:30
Prashant Singh eb2f805057 Correct name of channel column in CMS page datagrid 2019-08-16 19:18:00 +05:30
Prashant Singh b87e6cdb2e Fixed channel locale issue in cms datagrid 2019-08-16 18:48:13 +05:30
Jitendra Singh 59cfd13795
Merge pull request #1307 from prashant-webkul/development
Development
2019-08-16 17:50:18 +05:30
Prashant Singh beb579587c Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-08-16 17:47:39 +05:30
Prashant Singh bd6e0c9345 Structural changes in CMS pages. Fixed bugs #1300, #1295 2019-08-16 17:43:58 +05:30
Prashant Singh 39a07f0bd0 Structural changes in CMS pages 2019-08-16 17:36:47 +05:30