Commit Graph

839 Commits

Author SHA1 Message Date
jitendra 336284ee6e Refactor state grouping by country 2018-12-27 11:35:10 +05:30
jitendra 1bc6ea72e8 License link added in readme file 2018-12-26 20:10:38 +05:30
jitendra de90ab1d6a Per unit and per order feature added in Flatrate shipping 2018-12-26 19:33:01 +05:30
jitendra 6b2b054f97 Get config for shipping and payment method updated 2018-12-26 18:52:44 +05:30
jitendra 0b3ba4f06a Modified inventory selection during shipment creation 2018-12-26 18:34:49 +05:30
jitendra 2e668c7020 Inventory source selection feature added during shipment creation 2018-12-26 15:30:23 +05:30
JItendra Singh 2de5528372
Merge pull request #406 from prashant-webkul/master
Merge pull request #3 from bagisto/master
2018-12-26 15:28:57 +05:30
Prashant Singh bb6eb04b30
Merge pull request #3 from bagisto/master
merge with head to base forks
2018-12-26 15:11:23 +05:30
Prashant Singh 182bdba0e6
Merge branch 'master' into master 2018-12-26 15:11:09 +05:30
JItendra Singh c5c1cbf4ae
Merge pull request #404 from rahulshukla-webkul/development
Development
2018-12-26 14:57:55 +05:30
rahul shukla 54e359fb1a Merge branch 'master' of https://github.com/rahulshukla-webkul/bagisto into rahul 2018-12-26 14:53:13 +05:30
rahulshukla-webkul 4c2df325e9
Merge pull request #1 from bagisto/master
merge with master
2018-12-26 14:52:34 +05:30
rahul shukla 1e25226997 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-12-26 14:47:50 +05:30
rahul shukla 9bb9ae5ce7 configuration changes 2018-12-26 14:46:27 +05:30
Prashant Singh ee0ab9107d Shipping origin configuration 2018-12-26 13:59:51 +05:30
Prashant Singh 14ee9beb69 Slider validation fix, wasn't able to create slider layers 2018-12-24 15:33:39 +05:30
Prashant Singh ebbad1013f datagrid checkbox alignment issue resolved 2018-12-24 13:19:39 +05:30
Prashant Singh 851b25447f Merge branch 'master' of https://github.com/bagisto/bagisto 2018-12-24 11:18:43 +05:30
Prashant Singh bd02219f13
Merge pull request #2 from prashant-webkul/Prashant
datagrid date filter was not working with aliases is not fixed #392
2018-12-22 18:16:50 +05:30
Prashant Singh c939a57303
Merge pull request #394 from prashant-webkul/Prashant
Prashant -> fixes for #392 #319 #304 #378, #379 #373 #369
2018-12-22 18:10:22 +05:30
Prashant Singh 3789587584 datagrid date filter was not working with aliases is not fixed #392 2018-12-22 18:07:45 +05:30
Prashant Singh b2a63c05cd
Merge pull request #1 from prashant-webkul/Prashant
Prashant
2018-12-22 16:21:45 +05:30
Prashant Singh 232e430ab0 fixed issue #319 2018-12-22 16:15:23 +05:30
Prashant Singh affcca3d08 fixed issue #304 2018-12-22 16:12:42 +05:30
Prashant Singh e526af061e Fixed issues #378, #379 and #373 2018-12-22 15:02:10 +05:30
Prashant Singh 81da5bd1d1 Changed the product card hover style and fixed issue #369 2018-12-22 11:56:26 +05:30
jitendra f4ca5a5b34 Compiled assets for production 2018-12-21 18:54:07 +05:30
JItendra Singh 45da52912f
Merge pull request #377 from prashant-webkul/Prashant
cart customer details fetched when user logged in
2018-12-21 18:50:16 +05:30
Prashant Singh 2b8e198d0d cart customer details fetched when user logged in 2018-12-21 18:48:31 +05:30
JItendra Singh d7b95eec47
Merge pull request #376 from prashant-webkul/master
Issues and bug fixes
2018-12-21 18:46:39 +05:30
Prashant Singh 089aaadb71 merge conflicts removed 2018-12-21 18:35:23 +05:30
Prashant Singh ae9bcb8398 sort by field's translation value issue fixed on category page 2018-12-21 18:20:58 +05:30
JItendra Singh 4e7003d43e
Merge pull request #375 from jitendra-webkul/jitendra
Jitendra
2018-12-21 18:19:29 +05:30
jitendra 5916482f7c Add fire event on every controller 2018-12-21 18:18:34 +05:30
Prashant Singh 529db351f6 orders menu item was missing from the customer account side menu 2018-12-21 16:26:15 +05:30
Prashant Singh 6fba17ea81 Fixed issues #300 & Updated inventory in product grid after order received 2018-12-21 16:14:20 +05:30
Prashant Singh 5ebe171117 Fixed issue #363 2018-12-21 14:18:59 +05:30
Prashant Singh a69807c488 fixed issue #366 2018-12-21 14:15:24 +05:30
Prashant Singh 54a268302b fixed issue #354 2018-12-21 14:05:52 +05:30
jitendra 64e451d7f9 Issue #367 fixed 2018-12-21 13:57:58 +05:30
jitendra 17480d8b67 Issue #365 2018-12-21 13:25:58 +05:30
JItendra Singh c000aeb015
Merge pull request #364 from jitendra-webkul/jitendra
Issues #356
2018-12-21 13:19:02 +05:30
jitendra ae40692084 Issues #356 2018-12-21 13:18:05 +05:30
JItendra Singh 9ebeb6e50b
Merge pull request #362 from jitendra-webkul/jitendra
Issues #353, #354
2018-12-21 11:59:18 +05:30
jitendra 954502c571 Issues #353, #354 2018-12-21 11:58:02 +05:30
JItendra Singh d723ca77ba
Merge pull request #352 from bagisto/jitendra
Jitendra
2018-12-20 18:27:04 +05:30
jitendra 8b18b78663 Assets compiled for production 2018-12-20 18:26:18 +05:30
JItendra Singh 2d28969518
Merge pull request #351 from bagisto/rahul
Rahul
2018-12-20 18:21:39 +05:30
rahul shukla 405e8bfecb issue resolved 2018-12-20 18:20:52 +05:30
rahul shukla ef72b4d629 export button & review 2018-12-20 16:38:47 +05:30