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

2822 Commits

Author SHA1 Message Date
Matt April a8141c3fb3 Change 'self' references inside models to 'static'. This fixes issues when models are overriden, but he base class continues to references itself rather than the new model. 2019-09-07 20:14:27 -04:00
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
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
Sneh Sagar 020d8ccf7d
Merge pull request #1 from bagisto/master 
Get Latest Changes resolving admin.js
 2019-09-05 21:47:32 +05:30
Sneh Sagar 67b296d2b5 Port number added to database connection 2019-09-05 21:03:39 +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