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

2835 Commits

Author SHA1 Message Date
Prashant Singh 7d7cda1f73 Datagrid add column before and after event added 2019-09-11 01:32:35 +05:30
Prashant Singh 6c03f824ec Refactoring in catalog rule form 2019-09-10 04:11:43 +05:30
Prashant Singh f99cb5588f Fixed issue #1428 2019-09-10 02:42:02 +05:30
Jitendra Singh 889a286e0f
Merge pull request #1425 from rahulshukla-webkul/development 
wrong grand total in invoice
 2019-09-09 15:39:27 +05:30
rahul shukla 8d578c3720 wrong grand total in invoice 2019-09-09 15:33:05 +05:30
Jitendra Singh 9d5032d619
Merge pull request #1424 from rahulshukla-webkul/development 
Development
 2019-09-09 13:18:18 +05:30
Jitendra Singh da8b21cab1
Merge pull request #1420 from prashant-webkul/development 
Fixed translation issue in catalog rule delete notification
 2019-09-09 13:16:02 +05:30
rahul shukla 94727a4f1d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-09 12:57:44 +05:30
rahul shukla 98df7f25f7 Issue #1256 2019-09-09 12:57:28 +05:30
Prashant Singh 9c174202c3 Refactoring convertXToProductID 2019-09-08 07:12:06 +05:30
Prashant Singh 5651b4ed85 Cart rule form visual and translation changes 2019-09-08 02:50:11 +05:30
Prashant Singh 64f5bef341 Category filters : price filter was always active, turned active value to false 2019-09-08 01:37:04 +05:30
Prashant Singh 90a9fcfb31 Merge branch 'master' of http://github.com/bagisto/bagisto into development 2019-09-08 01:35:56 +05:30
Prashant Singh 2efffafab1 Fixed translation issue in catalog rule delete notification 2019-09-07 18:59:04 +05:30
Jitendra Singh 7d53452bd1
Merge pull request #1419 from prashant-webkul/development 
Rogue statement found in discount amount initialization
 2019-09-07 16:52:48 +05:30
Prashant Singh 6a24ed723e Rogue statement found in discount amount initialization 2019-09-07 16:29:33 +05:30
Jitendra Singh 3b99bf02f3
Merge pull request #1418 from rahulshukla-webkul/development 
Development
 2019-09-07 15:20:08 +05:30
rahul shukla 4d13c0586a Issue #1306 2019-09-07 15:18:24 +05:30
rahul shukla b5ef9526de Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-07 15:09:00 +05:30
rahul shukla 8ce93244de Issue #1263 2019-09-07 15:08:26 +05:30
Jitendra Singh dede76a442
Merge pull request #1416 from rahulshukla-webkul/development 
changed in webpack
 2019-09-07 13:30:02 +05:30
rahul shukla 9e8edfa226 changed in webpack 2019-09-07 13:27:54 +05:30
Jitendra Singh 11d317e27c
Merge pull request #1412 from prashant-webkul/development 
Cart rule form variables normalized
 2019-09-07 10:27:27 +05:30
Prashant Singh 1aab4ccfe3 more normalization of cart rule form variables 2019-09-07 04:48:27 +05:30
Prashant Singh c190f6f230 Cart rule form variables normalized 2019-09-07 04:28:42 +05:30
Jitendra Singh cc565ad5ec
Merge pull request #1410 from prashant-webkul/development 
Development
 2019-09-06 19:50:45 +05:30
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
Jitendra Singh f078762d98
Merge pull request #1405 from prashant-webkul/development 
Fixed edge case conditions and a bug in application of couponable rule
 2019-09-06 14:59:49 +05:30
Jitendra Singh 87ab5b1fe2
Merge pull request #1401 from sagarsneh/master 
Port number added to database connection
 2019-09-06 13:55:10 +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
Jitendra Singh f683f105c3
Merge pull request #1404 from prashant-webkul/development 
Development
 2019-09-06 12:48:01 +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