Commit Graph

2859 Commits

Author SHA1 Message Date
Jitendra Singh fe335a0e70
Merge pull request #1437 from prashant-webkul/development
Datagrid add column, action and mass action dynamic event fire. Command line utility for installation.
2019-09-11 12:35:34 +05:30
Prashant Singh 82ae345fdf Generate products 2019-09-11 07:03:40 +05:30
Prashant Singh 2c45bddb11 Command line installation utility, console status strings written. 2019-09-11 06:41:48 +05:30
Prashant Singh e0778b394a Command line installation utility enchancements 2019-09-11 06:37:41 +05:30
Prashant Singh 2bbb85455a Bagisto command line installer for artisan commands 2019-09-11 06:10:20 +05:30
Prashant Singh b7d604ed31 Datagrid events unleashed 2019-09-11 03:18:32 +05:30
Prashant Singh 1e22e61282 Base sync 2019-09-11 03:11:55 +05:30
Prashant Singh 98e8f3c57d All datagrids are generating before add column, action and mass action 2019-09-11 03:10:38 +05:30
Prashant Singh 7d7cda1f73 Datagrid add column before and after event added 2019-09-11 01:32:35 +05:30
Jitendra Singh 460256e2db
Merge pull request #1435 from ghermans/sessionTime
Increased the session lifetime
2019-09-10 17:58:39 +05:30
Prashant Singh 69e46a7ddd Fixed translation issues in discount forms 2019-09-10 17:58:19 +05:30
Glenn Hermans 218e486baf
Increased the session timeout 2019-09-10 14:25:07 +02:00
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
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 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 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