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

3152 Commits

Author SHA1 Message Date
jitendra b5163fe9b3 Fixed Not getting sample link for file if url is selected 2019-09-10 15:06:34 +05:30
Jitendra Singh a638777306
Merge pull request #1432 from prashant-webkul/development 
Missed a ! symbol in conditions object's attribute validation
 2019-09-10 14:58:20 +05:30
Prashant Singh c3b54c389a Catalogrule form variables for json data encode and decode are now normalized 2019-09-10 14:54:47 +05:30
Prashant Singh b4872b5c21 Missed a ! symbol in conditions object's attribute validation 2019-09-10 14:42:59 +05:30
Jitendra Singh 60a24016e9
Merge pull request #1431 from rahulshukla-webkul/development 
route check added for product flat update
 2019-09-10 13:27:22 +05:30
rahul shukla 14773bbfa8 route check added for product flat update 2019-09-10 13:25:26 +05:30
Jitendra Singh 182c33305c
Merge pull request #1430 from rahulshukla-webkul/development 
Development
 2019-09-10 13:13:05 +05:30
rahul shukla 403a9dda4c wishlist icon is active when item is already in wishlist 2019-09-10 13:10:58 +05:30
Jitendra Singh 843fbb1922
Merge pull request #1422 from MattApril/master 
Change 'self' references inside models to 'static'. This fixes issues…
 2019-09-10 12:45:51 +05:30
Jitendra Singh a33a47753d
Merge pull request #1429 from prashant-webkul/development 
Development
 2019-09-10 12:45:16 +05:30
Jitendra Singh 565452954b
Merge pull request #1427 from rahulshukla-webkul/development 
Issue #1259
 2019-09-10 12:45:07 +05:30
rahul shukla 599bffdce7 wishlist icon is active when item is already in wiahlist 2019-09-10 12:35:52 +05:30
jitendra 6f3b95811b Conflicts resolved 2019-09-10 12:29:19 +05:30
jitendra 98bd644e3e Created command for updated min_price and max_price based on special_price 2019-09-10 12:18:01 +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
rahul shukla f49e25ea1f Issue #1259 2019-09-09 18:34: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 10b706c1d7 Merged with master 2019-09-09 14:46:43 +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
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
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 49ca240675 Duplicate product in cart issue fixed 2019-09-07 15:38:49 +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
jitendra 8545d5ef3c Unlimited download link issue fixed 2019-09-06 19:46:25 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +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