merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,810 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

2008 Commits

Author SHA1 Message Date
Prashant Singh 35d43b0b5a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-06 19:08:38 +05:30
Prashant Singh 047a34e76b Translation fixes and changes in cart rule datagrid 2019-09-06 19:04:57 +05:30
Jitendra Singh bb602ba9b2
Merge pull request #1409 from prashant-webkul/development 
Fixes in checking json data of attribute conditions on server side
 2019-09-06 18:50:47 +05:30
Prashant Singh 557a5b0143 Fixes in checking json data of attribute conditions on server side 2019-09-06 18:49:07 +05:30
Jitendra Singh 449f50ebfc
Merge pull request #1408 from prashant-webkul/development 
JSON data parsing trimmed down from two levels to a single level in Cart rule update form
 2019-09-06 17:15:41 +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
Jitendra Singh ea59825efe
Merge pull request #1407 from prashant-webkul/development 
Edge case condition fixed in FixedAmount
 2019-09-06 15:46:30 +05:30
Prashant Singh b3472204c7 Edge case condition fixed in FixedAmount 2019-09-06 15:24:15 +05:30
Jitendra Singh 22b24c4c6e
Merge pull request #1406 from rahulshukla-webkul/development 
Development
 2019-09-06 15:12:25 +05:30
rahul shukla 1cd6916c2b issue #1351 2019-09-06 15:11:21 +05:30
rahul shukla 6e32b928ac issue #1351 2019-09-06 15:08:17 +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 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
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
Prashant Singh 8a6b5d4723 Assets compiled for production 2019-09-05 18:37:58 +05:30
rahul shukla 7d9c785f7d issue #1226 2019-09-05 18:06:51 +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
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
Hossein f20dea46e4
Fix #1392 2019-09-05 09:33:08 +04: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
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
Prashant Singh 5b563ca0d1 Reverting to original settings 2019-09-03 12:36:57 +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 f8cbdd488c Fixed issue #1366 2019-09-02 23:00:39 +05:30
Prashant Singh 60413b252a Fixed issue #1379 2019-09-02 22:47:03 +05:30
Prashant Singh 34c14c17fc Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-09-02 22:31:28 +05:30
Prashant Singh 4ecba193fc Merge branch 'master' of http://github.com/bagisto/bagisto into development 2019-09-02 22:31:14 +05:30
Prashant Singh 1c1961f2d2 Upgraded with Base and updated preorder 2019-09-02 19:58:18 +05:30
Prashant Singh 108795778b Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-02 19:53:25 +05:30
Prashant Singh 3794dc2e7c removed provider issues in GTM and Webfont 2019-09-02 19:52:39 +05:30
Prashant Singh ca3dfe804c Fixed issue #1380 2019-09-02 13:52:28 +05:30
Prashant Singh 5ad8e46a86 Catalog rule frontend implementation started 2019-08-31 20:37:28 +05:30
Jitendra Singh 04636229d8
Merge pull request #1377 from prashant-webkul/development 
Current discount actions are normalized again with safe conditions im…
 2019-08-31 18:20:26 +05:30
Prashant Singh f8e9f37c5d Current discount actions are normalized again with safe conditions implemented 2019-08-31 18:18:28 +05:30
Jitendra Singh 6158e8cd16
Merge pull request #1374 from prashant-webkul/development 
Development
 2019-08-31 18:02:26 +05:30