Commit Graph

2796 Commits

Author SHA1 Message Date
Prashant Singh 557a5b0143 Fixes in checking json data of attribute conditions on server side 2019-09-06 18:49:07 +05:30
Prashant Singh 57f3cbb8af JSON parsing in cart rule update form fixes 2019-09-06 16:58:35 +05:30
Prashant Singh b1f0416ca0 Spell correction 2019-09-06 16:29:56 +05:30
Prashant Singh b3472204c7 Edge case condition fixed in FixedAmount 2019-09-06 15:24:15 +05:30
Prashant Singh 6ca065544c Edge case fix for Cart Rule actions 2019-09-06 13:46:20 +05:30
Prashant Singh c9cd73b67e Fixed edge case conditions and a bug in application of couponable rule 2019-09-06 13:38:05 +05:30
Prashant Singh d2e843648d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-06 12:44:56 +05:30
Jitendra Singh 2467c0918c
Merge pull request #1403 from prashant-webkul/development
Whole cart to fixed and whole cart to percent eligible items conditio…
2019-09-06 12:42:01 +05:30
Prashant Singh 44c5ebc4f8 refactoring 2019-09-06 12:41:46 +05:30
Prashant Singh adad426228 missed a semicolon 2019-09-06 12:40:52 +05:30
Prashant Singh 2ac298cb68 Refactoring cart rule actions 2019-09-06 12:39:25 +05:30
Prashant Singh 5e47c5b2af More refactoring of discount assign to cart item 2019-09-06 12:37:46 +05:30
Prashant Singh 9c23179d6e Whole cart to fixed and whole cart to percent eligible items conditions corrected 2019-09-06 12:29:16 +05:30
Jitendra Singh 679cb01997
Merge pull request #1398 from rahulshukla-webkul/development
issue #1226
2019-09-06 11:16:18 +05:30
Jitendra Singh 5030fd3f8b
Merge pull request #1400 from prashant-webkul/development
Fixed issue #1391
2019-09-06 11:16:03 +05:30
Prashant Singh 4a3bfd6e2c Refactored actions of cart rules 2019-09-06 05:45:16 +05:30
Prashant Singh 573aea9c75 Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-09-06 03:05:40 +05:30
Prashant Singh 256556a872 Fixed issue #1391 2019-09-05 19:51:02 +05:30
Jitendra Singh 8ddfc89ed8
Merge pull request #1399 from prashant-webkul/development
Development
2019-09-05 18:44:47 +05:30
Prashant Singh 8a6b5d4723 Assets compiled for production 2019-09-05 18:37:58 +05:30
Prashant Singh 69d3478ecb Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-05 18:36:19 +05:30
rahul shukla 7d9c785f7d issue #1226 2019-09-05 18:06:51 +05:30
Jitendra Singh 538c40f535
Merge pull request #1397 from rahulshukla-webkul/development
Development
2019-09-05 16:46:58 +05:30
rahul shukla 11391b2fd8 conflict resolve 2019-09-05 16:45:39 +05:30
rahul shukla ddf754e2a7 Issue #1384 2019-09-05 16:41:26 +05:30
Prashant Singh 32b05c924d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-05 16:29:43 +05:30
Prashant Singh ec6dd75dfe JWTAuth package's dependency is now version restricted 2019-09-05 16:28:36 +05:30
Jitendra Singh c4de6548dd
Merge pull request #1396 from ghermans/dusk
fixed #1367
2019-09-05 16:25:56 +05:30
Jitendra Singh 89d26e7313
Merge pull request #1395 from prashant-webkul/development
Development branches removed from composer dependencies
2019-09-05 16:13:53 +05:30
Glenn Hermans b3eb0b3f88
fixed #1367 2019-09-05 12:12:45 +02:00
Prashant Singh 70f3cf6219 Development branches removed from composer dependencies 2019-09-05 13:23:33 +05:30
rahul shukla 9916424e0d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-05 13:13:16 +05:30
rahul shukla c3d9ac8706 conflict resolve 2019-09-05 13:13:00 +05:30
Jitendra Singh be2d2608f7
Merge pull request #1393 from hChamran/patch-1
Fix #1392
2019-09-05 11:21:48 +05:30
Hossein f20dea46e4
Fix #1392 2019-09-05 09:33:08 +04:30
Jitendra Singh f9580b077a
Merge pull request #1390 from prashant-webkul/development
Changes in core repository made
2019-09-04 14:44:08 +05:30
Prashant Singh 6693a443d3 Removed latest flag check from prettus l5 repository 2019-09-04 14:00:45 +05:30
Prashant Singh 0468a1fdd6 Changes in core repository made 2019-09-04 13:36:34 +05:30
Jitendra Singh caaf210aa1
Merge pull request #1389 from prashant-webkul/development
Development
2019-09-04 11:42:45 +05:30
Prashant Singh c7f1e4996a Updated readme 2019-09-04 11:41:52 +05:30
Prashant Singh 0e51a9eab2 Changed minimum php version to 7.2 2019-09-04 11:39:20 +05:30
Prashant Singh ce79814408 Minor fix 2019-09-03 16:38:50 +05:30
Jitendra Singh 1171ae3220
Merge pull request #1386 from prashant-webkul/development
Reverting to original settings
2019-09-03 15:18:59 +05:30
Prashant Singh 0abb36b767 Removed dead code 2019-09-03 12:53:28 +05:30
Prashant Singh 5b563ca0d1 Reverting to original settings 2019-09-03 12:36:57 +05:30
Jitendra Singh 6231e7a331
Merge pull request #1383 from prashant-webkul/development
Development
2019-09-03 12:31:28 +05:30
Prashant Singh e7e2d6adbb Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-09-03 12:24:51 +05:30
Prashant Singh f1f0bcac8c Dead mods removed 2019-09-03 12:24:20 +05:30
Prashant Singh c6571c810b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-03 12:19:49 +05:30
Prashant Singh f77cf2263a sync 2019-09-03 10:30:02 +05:30