Commit Graph

875 Commits

Author SHA1 Message Date
Prashant Singh dbc218243f Datagrid refactoring complete 95%, remaining with distincts and refactoring all grids according to the newly refactored method 2019-01-08 13:59:13 +05:30
Prashant Singh d68e14f12e datagrid refactoring completed to 80% 2019-01-08 13:00:20 +05:30
Prashant Singh 6d3bcca6f8 filters and sorts done, yet facing an issue url writing and decoding 2019-01-07 18:14:43 +05:30
Prashant Singh 926158cc0d datagrid refactored from backend to frontend, remaining is filters, sorts and searches to be refactored into vue components 2019-01-07 13:37:35 +05:30
Prashant Singh cb0a50233c Datagrid now fault tolerant on not passing select key in its configuration 2019-01-03 16:54:13 +05:30
Prashant Singh 7117038287 datagrid operator bag dependency removed , now operators are already there in Datagrid classes 2019-01-03 15:43:47 +05:30
Prashant Singh 2b32a6252e black listing some key parameters from the request bag and server bag and post bag 2019-01-03 14:53:01 +05:30
JItendra Singh c9f2fd218b
Merge pull request #425 from jitendra-webkul/jitendra
Jitendra
2019-01-02 20:08:57 +05:30
jitendra 98e2d0e52c Merged with master 2019-01-02 20:07:00 +05:30
jitendra 6ae9dbaef4 Issue fixed 2019-01-02 20:05:11 +05:30
JItendra Singh 9eabca881f
Merge pull request #423 from jitendra-webkul/jitendra
Channel alter migration issue fixed
2018-12-31 18:49:50 +05:30
jitendra c49e7b6e5f Channel alter migration issue fixed 2018-12-31 18:49:06 +05:30
JItendra Singh 4e89ce082e
Merge pull request #422 from jitendra-webkul/jitendra
Channel root category feature added
2018-12-31 16:35:50 +05:30
jitendra cb3da5fc08 Channel root category feature added 2018-12-31 16:34:26 +05:30
JItendra Singh e387cec43f
Merge pull request #420 from jitendra-webkul/jitendra
Moved catalog event from controllers to repositories
2018-12-27 18:59:41 +05:30
JItendra Singh 27d3f517fe
Merge pull request #419 from jitendra-webkul/jitendra
Removed auth middleware from controllers
2018-12-27 18:58:56 +05:30
jitendra abd3bba617 Moved catalog event from controllers to repositories 2018-12-27 18:57:39 +05:30
jitendra 9581082f56 Removed auth middleware from controllers 2018-12-27 17:05:05 +05:30
JItendra Singh 857db4f244
Merge pull request #418 from prashant-webkul/development
Development
2018-12-27 16:34:07 +05:30
Prashant Singh 0d64d96c9c Merge branch 'master' of https://github.com/prashant-webkul/bagisto into development 2018-12-27 16:29:57 +05:30
Prashant Singh 8fb2c1a99a
Merge pull request #5 from bagisto/master
Necessary merge with master to fetch the new improvements of shipping
2018-12-27 16:29:42 +05:30
Prashant Singh 0a2a6c4234 conflicts in class attribute of storefront search and datagrid's search box 2018-12-27 16:22:44 +05:30
JItendra Singh be2cf2372d
Merge pull request #417 from jitendra-webkul/jitendra
Changed registration page input tag to button
2018-12-27 13:04:47 +05:30
jitendra fec802b4af Changed registration page input tag to button 2018-12-27 13:03:54 +05:30
JItendra Singh 9a730af7ed
Merge pull request #416 from jitendra-webkul/jitendra
Refactor state grouping by country
2018-12-27 11:36:17 +05:30
jitendra 336284ee6e Refactor state grouping by country 2018-12-27 11:35:10 +05:30
JItendra Singh dfd30bc2b3
Merge pull request #415 from jitendra-webkul/jitendra
License link added in readme file
2018-12-26 20:11:29 +05:30
jitendra 1bc6ea72e8 License link added in readme file 2018-12-26 20:10:38 +05:30
JItendra Singh 575f4b4bf2
Merge pull request #414 from bagisto/add-license-1
Create LICENSE
2018-12-26 19:54:56 +05:30
JItendra Singh 0cb5eacd9e
Create LICENSE 2018-12-26 19:54:44 +05:30
JItendra Singh 69875dac77
Merge pull request #411 from jitendra-webkul/jitendra
Per unit and per order feature added in Flatrate shipping
2018-12-26 19:34:00 +05:30
jitendra de90ab1d6a Per unit and per order feature added in Flatrate shipping 2018-12-26 19:33:01 +05:30
JItendra Singh feb6c8cc76
Merge pull request #409 from jitendra-webkul/jitendra
Get config for shipping and payment method updated
2018-12-26 18:54:06 +05:30
jitendra 6b2b054f97 Get config for shipping and payment method updated 2018-12-26 18:52:44 +05:30
JItendra Singh a3d2f121aa
Merge pull request #408 from jitendra-webkul/jitendra
Jitendra
2018-12-26 18:35:51 +05:30
jitendra 0b3ba4f06a Modified inventory selection during shipment creation 2018-12-26 18:34:49 +05:30
Prashant Singh 1cd685cee9 Merge branch 'master' of https://github.com/prashant-webkul/bagisto into development 2018-12-26 15:40:11 +05:30
Prashant Singh 759994d259
Merge pull request #4 from bagisto/master
Merge pull request #406 from prashant-webkul/master
2018-12-26 15:39:25 +05:30
Prashant Singh 24cf46fb4a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2018-12-26 15:33:13 +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 e39e842bd5 erge branch 'master' of https://github.com/prashant-webkul/bagisto 2018-12-26 15:11:52 +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
Prashant Singh f040129cbb Merged with master #404 2018-12-26 15:02:38 +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