Commit Graph

6592 Commits

Author SHA1 Message Date
jitendra 8ba80c0d2b Cart facade issue fixed 2018-09-27 16:16:57 +05:30
jitendra c8c30643e8 Merge 2018-09-27 15:46:38 +05:30
jitendra 2ed733941e Unnecessary code removed from cart page 2018-09-27 15:43:47 +05:30
prashant-webkul b8b84bc639 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-09-27 15:41:15 +05:30
prashant-webkul a794aa0b44 Before merge for cart 2018-09-27 15:37:54 +05:30
jitendra 9e57c5117b Cart page issues fixedx 2018-09-27 15:31:25 +05:30
prashant-webkul e0f45d2762 Before merge with master 2018-09-27 13:25:34 +05:30
jitendra 19775a4017 Checkout review page added 2018-09-27 13:23:26 +05:30
jitendra 69ada20a2b Unnecessary css removed 2018-09-27 10:55:06 +05:30
prashant-webkul d14db9455e cart's implementation now moving towards normalized forms and improved the database structure for cart and cartitems table. 2018-09-26 19:58:32 +05:30
jitendra f9bcfac638 CSS fixed 2018-09-26 15:54:33 +05:30
jitendra 2930e1cbbd CSS fixed 2018-09-26 15:53:06 +05:30
jitendra de842320f0 Checkout review page added 2018-09-26 15:49:18 +05:30
jitendra 0bbda4158f Merged 2018-09-26 09:53:56 +05:30
jitendra e2bac8a34e Cart fixes 2018-09-26 09:51:14 +05:30
rahul shukla 63daacf9c7 conflict resolve 2018-09-26 09:47:02 +05:30
rahul shukla 3b29f8d501 filter & sort 2018-09-25 19:14:46 +05:30
prashant-webkul 26de50bc46 Fixed bugs and made way for exisiting features of cart to be implemented in new future 2018-09-25 14:07:34 +05:30
prashant-webkul aeaf81f08b Merge with master on stage checkout 2018-09-25 11:08:40 +05:30
jitendra 692aa9a718 cart shipping/billing address save 2018-09-25 10:52:22 +05:30
prashant-webkul d99ef7eb9f Cart Page Design Changes to be performed 2018-09-24 17:35:09 +05:30
rahul shukla 3c9153be87 Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul 2018-09-24 16:12:10 +05:30
rahul shukla 54c5d5cb21 responsive 2018-09-24 16:11:18 +05:30
rahul shukla ac39fca00e responsive 2018-09-22 15:42:23 +05:30
prashant-webkul c8f67009b1 Cart Inventories now pulling up item count using inventory sources status 2018-09-22 14:01:18 +05:30
prashant-webkul e37bfabda7 Inventory source check done 2018-09-21 20:02:36 +05:30
rahul shukla a40156bdbd reviews 2018-09-21 19:21:19 +05:30
rahul shukla 335f27e1f6 review issues 2018-09-21 19:13:41 +05:30
prashant-webkul 174ab21fa7 Changed the cart to session dependent code only 2018-09-21 18:57:27 +05:30
prashant-webkul fdb278c6da merging with master 2018-09-21 15:49:44 +05:30
prashant-webkul c94b5f6fbe Cart in progress before merge 2018-09-21 15:47:43 +05:30
jitendra facf3de81a Checkout shipping and payment steps added 2018-09-21 15:47:01 +05:30
rahul shukla a120adf10e customer edit 2018-09-21 11:29:22 +05:30
prashant-webkul 2b0f9d50aa Cart Refactored More Optimized 2018-09-20 20:42:11 +05:30
prashant-webkul 8f28bd162e Fixed errors in providers file and composer version bag which was allowing composer to autoload even when paths in provider and composer files were not correct 2018-09-20 19:54:33 +05:30
JItendra Singh 51b4278262
Merge pull request #13 from bagisto/prashant
Cart added
2018-09-20 15:47:10 +05:30
jitendra 3165112aeb Check process fixed 2018-09-20 15:45:18 +05:30
prashant-webkul ce69492dcd Removed cart migration rename conflicts 2018-09-20 15:40:43 +05:30
prashant-webkul 2474f5c787 merged with master 2018-09-20 15:37:44 +05:30
jitendra 31ae7c025e Check process 2018-09-20 15:31:51 +05:30
prashant-webkul 50a0bc60b5 Cart Fixes 2018-09-20 15:30:52 +05:30
prashant-webkul 2721080a1b Just add more logics to cart and cart items from here 2018-09-20 14:03:28 +05:30
rahul shukla 8fbf2b7b79 conflict resolve 2018-09-19 15:36:32 +05:30
rahul shukla 1e2681adb3 product-detail page responsive 2018-09-19 15:22:10 +05:30
prashant-webkul e3d1805043 Merged with master 2018-09-19 12:33:06 +05:30
prashant-webkul a24c789a3c before merge 2018-09-19 12:30:24 +05:30
jitendra acd048aaf6 Checkout page 2018-09-19 12:28:15 +05:30
prashant-webkul ec6d777b25 Cart Working by adding the products as guest and logged in user and merging in case of guest user to logged in. Ready for next phase of checkouts. 2018-09-17 13:57:32 +05:30
rahul shukla 9743a6b1e1 conflict 2018-09-15 15:57:19 +05:30
rahul shukla 4f42f6d4d3 conflict 2018-09-15 15:31:16 +05:30
rahul shukla 94eb52389e product-detail 2018-09-15 15:19:58 +05:30
prashant-webkul dbfe16e3bd Rework the merge function else all would be fine 2018-09-15 14:46:16 +05:30
rahul shukla ceabaf4198 responive pages 2018-09-15 13:42:19 +05:30
prashant-webkul 477dded06e Product details page layout is fixed 2018-09-15 13:39:56 +05:30
prashant-webkul 9cea4133f7 Case of Cart Merging Left 2018-09-14 18:45:49 +05:30
prashant-webkul 84a687239d Do not take this pull very reactive 2018-09-13 19:10:01 +05:30
prashant-webkul b22e82b8cf Mergingchanges 2018-09-13 17:20:12 +05:30
prashant-webkul 0222c97a53 Merging changes with master 2018-09-13 16:57:13 +05:30
rahul shukla 87e5e9a2bc checkout process 2018-09-13 16:46:47 +05:30
rahul shukla 1be2127591 checkout process 2018-09-13 16:40:45 +05:30
prashant-webkul ac093c465b Cart Module being modified accodrding to session 2018-09-13 16:36:17 +05:30
jitendra 160f92b542 Product detail page completed 2018-09-13 16:34:56 +05:30
prashant-webkul 4e7b1f157b Merged with master 2018-09-12 12:27:01 +05:30
prashant-webkul 398caff7bc Cart Module in progress 70% 2018-09-11 16:49:40 +05:30
jitendra 9731b499d4 Conflicts resolve 2018-09-11 16:10:57 +05:30
jitendra 5202729391 Configurable options added 2018-09-11 16:00:02 +05:30
rahul shukla b082d73707 customer edit/add & show in admin 2018-09-11 09:41:48 +05:30
jitendra 4fb084557d Commit to master 2018-09-10 15:04:57 +05:30
prashant-webkul 40e04abddf On the new origin 2018-09-10 15:01:34 +05:30
jitendra c38b1fc7b3 First commit 2018-09-10 14:50:08 +05:30
rahul shukla d0e0b64445 merge conflict 2018-09-08 14:22:46 +05:30
rahul shukla 149c98ff03 customer & review 2018-09-08 14:11:36 +05:30
prashant-webkul e07be27d8b Merged with master 2018-09-06 12:19:22 +05:30
prashant-webkul 29d83d7b5f Cart Packages files 2018-09-06 11:50:30 +05:30
prashant-webkul 888dfc6b0f Tax Module completed 2018-09-05 16:26:42 +05:30
prashant-webkul 4cf6ab5f00 Tax Module Completed with just edit form left. 2018-09-04 14:44:32 +05:30
prashant-webkul df199f0728 Taxes, long intended routes, ACL now prevents login if user already logged in. 2018-08-31 11:33:11 +05:30
rahul shukla 0c6d92dbfc conflict resolve 2018-08-30 18:59:23 +05:30
jitendra 0c8b5a03e2 Product details page added 2018-08-30 18:52:15 +05:30
rahul shukla 23653a7922 conflict resolve 2018-08-30 18:05:43 +05:30
rahul shukla bf02006ac9 merged with master 2018-08-30 15:45:22 +05:30
rahul shukla ff57baa7cb shop & UI layouts 2018-08-30 15:38:53 +05:30
prashant-webkul 371012a6be Customer profile and customer review completed 2018-08-24 10:48:53 +05:30
prashant-webkul 1bff70bd7b Customer Account Section Mostly Completed Upto 80% 2018-08-23 18:41:56 +05:30
prashant-webkul 20d486cc17 merged with master 2018-08-22 15:25:23 +05:30
prashant-webkul 4403fedc89 Before merge 2018-08-22 15:16:27 +05:30
jitendra bc087010ee Repository pattern changes 2018-08-22 15:14:35 +05:30
prashant-webkul 8dec681e49 Merge branch 'master' of https://github.com/jitendra-webkul/bagisto into prashant
Merging with changes in the routes of the customer and some css bugs in the customer view files.
2018-08-22 12:59:27 +05:30
prashant-webkul 01d5cc1f3b Before merge with master 2018-08-22 12:58:54 +05:30
jitendra 86b7971b61 Customer Profile issues fixed 2018-08-22 12:57:41 +05:30
JItendra Singh e6600220ce
Merge pull request #25 from jitendra-webkul/jitendra
Merge issue fixed
2018-08-22 12:36:18 +05:30
jitendra 149ae5ff74 Merge issue fixed 2018-08-22 12:35:17 +05:30
prashant-webkul 36a05a4bcd Customer routes now tranferred in master route table for packages, removed display bug from navigation menu and removed the item from the root parent of navigation menu in storefront 2018-08-22 10:41:48 +05:30
prashant-webkul 22b465cbed Customer Sign Up Bug Fixed 2018-08-21 19:02:12 +05:30
jitendra 7c775a571e Issue fixed 2018-08-21 18:44:48 +05:30
prashant-webkul eaf721f062 merging with master 2018-08-21 16:35:43 +05:30
jitendra 7e95b89ec8 For demo 2018-08-21 16:28:55 +05:30
prashant-webkul 5c5bccd293 product grid theme restructuring in mid way 2018-08-20 19:17:42 +05:30
prashant-webkul 989990fc78 Merged with master 2018-08-17 12:05:18 +05:30
prashant-webkul ea0a288f87 Minor changes in git ignores 2018-08-17 11:26:12 +05:30
jitendra 6e24741b2f Layout fixed 2018-08-17 11:21:51 +05:30
jitendra bde79be88e Theme manager completed 2018-08-17 11:18:21 +05:30
prashant-webkul 608a74a0b8 DataGrid improvements and fixed a validation bug in the product controller 2018-08-16 19:09:51 +05:30
prashant-webkul 3da39943f1 Datagrid bug fixes 2018-08-16 13:37:37 +05:30
prashant-webkul bb3551a564 Datagrid bug fixes 2018-08-16 12:52:42 +05:30
prashant-webkul 238b2fb20c DataGrid filters now restricted to one per one column 2018-08-16 12:45:54 +05:30
prashant-webkul 21a16b8cf0 Refactored the code for datagrid from view composers to selft dependent injection classes and storefront views directory structure is segregated. 2018-08-16 11:35:45 +05:30
prashant-webkul e9d6b93242 layouting for two pages product review and cart page has been done 2018-08-14 19:15:11 +05:30
prashant-webkul 2e4fc2f8a3 Product details page layout complete 2018-08-13 19:14:04 +05:30
prashant-webkul e173f9c7e6 Slider animations and transition working. 2018-08-13 14:39:40 +05:30
prashant-webkul 282d8695bc Slider now working now make it responsive 2018-08-10 14:58:35 +05:30
prashant-webkul 9e960ec0ad Merging with master 2018-08-09 17:44:36 +05:30
jitendra 53357c17c9 Product Image Upload Added 2018-08-09 17:37:56 +05:30
prashant-webkul e480a7c625 Slider on store front implemented with html content, css and transition animations left 2018-08-09 17:30:26 +05:30
prashant-webkul fb1daf8fbc Validations normalized 2018-08-09 12:49:33 +05:30
prashant-webkul f8aba20be9 validation added in customer sign in and register pages 2018-08-09 12:01:54 +05:30
prashant-webkul 7701805d9b made the translations for customer login and sign up page, more tranlation strings coming up in next commits 2018-08-09 11:30:51 +05:30
prashant-webkul 4b6bb9540f Merged with master 2018-08-09 10:06:51 +05:30
prashant-webkul 73d044a4f9 Sliders grid now joined with channels 2018-08-09 10:05:32 +05:30
jitendra ff50784aa8 Added product creation page 2018-08-09 10:05:13 +05:30
prashant-webkul 8406da969d Slider layers now working, datagrid on slider working 2018-08-08 19:17:40 +05:30
prashant-webkul 3fa134ca16 Datagrid Integration in Settings done. 2018-08-08 15:07:04 +05:30
prashant-webkul 2c90d713af Datagrid working without dots in the URL, next is to put the validation for valid aliasing if aliasing is used and set true 2018-08-08 11:03:23 +05:30
prashant-webkul 7ddcba62f9 Datagrid fallback to new URL format 2018-08-07 18:57:59 +05:30
prashant-webkul 6b54f4d526 pagination working, non aliasing bugs removed, datagrid working good 2018-08-06 19:51:11 +05:30
prashant-webkul 2f3b0179d6 Non aliased case bug removed 2018-08-06 17:11:20 +05:30
prashant-webkul 2e70b577a2 Non Aliased case working 2018-08-06 16:53:45 +05:30
prashant-webkul ce1a3ebad6 Bug fixes and UI touchups in DataGrid 2018-08-06 15:21:24 +05:30
prashant-webkul 7c5253aec2 Slider Configuration in works ready to save slider images in next commit 2018-08-03 20:20:13 +05:30
prashant-webkul 7a7cacf515 fixes and style changes 2018-08-02 20:28:12 +05:30
prashant-webkul cc37e352a8 Icons fixed in storefront 2018-08-02 13:16:48 +05:30
prashant-webkul fad5944bf7 Merge branch 'master' of https://github.com/jitendra-webkul/bagisto into prashant 2018-08-02 13:14:07 +05:30
jitendra 94cfd31e64 date issue fixed 2018-08-02 13:13:04 +05:30
prashant-webkul f035006aef merging the changes with master 2018-08-02 13:04:54 +05:30
prashant-webkul ec8fdeca6f data grid empty values in filters redirecting to exception is now fixed. 2018-08-02 12:59:54 +05:30
jitendra f99d9ebcad Product edit page added with all attribuite type fields 2018-08-02 09:49:45 +05:30
prashant-webkul 9e3c3a357a Front category navigation and store front account dropdown complete 2018-08-01 20:30:31 +05:30
prashant-webkul 42848e7476 Category Navigation in the store front done with few style touch ups left 2018-08-01 11:52:13 +05:30
prashant-webkul c4aa34430f Navigation Category Menu working, with little css makeover will be innext commit 2018-08-01 11:43:51 +05:30
jitendra 71fd4a6237 Product page 2018-08-01 11:41:33 +05:30
prashant-webkul 49d6d440e5 navigation menu category ready, styles left to be applied accordingly 2018-07-31 15:52:38 +05:30
jitendra f236da61ab Added Repository Pattern to User 2018-07-31 13:20:54 +05:30
prashant-webkul 9de89a319d Implemented the category composer for header in shop bundle and removed some bugs 2018-07-30 19:51:06 +05:30
prashant-webkul 1442733f30 store front slide and segregation of view templates 2018-07-28 18:33:47 +05:30
prashant-webkul 6910ca47f5 Customer account's side menu now being generated dynamically 2018-07-28 15:15:33 +05:30
prashant-webkul 15043a249b Edit form, logout route for customer 2018-07-27 19:07:56 +05:30
prashant-webkul 587aaf3961 Customer package for wrong hint path for view fixed 2018-07-27 15:45:28 +05:30
prashant-webkul f119f95ed7 Migrations fixed for customers 2018-07-27 15:38:04 +05:30
prashant-webkul 1358a6a27d Moved assets and views from customers to shop 2018-07-27 15:14:51 +05:30
jitendra e65aab372d Vendor removed from customer 2018-07-27 15:11:26 +05:30
jitendra 21a9257d3f Vendor removed from customer 2018-07-27 15:10:25 +05:30
jitendra b38e926178 Vendor removed from customer 2018-07-27 15:07:47 +05:30
jitendra 4431e5ce0e Vendor removed from customer 2018-07-27 15:05:56 +05:30
jitendra b68cc29c68 Vendor removed from customer 2018-07-27 15:04:50 +05:30
JItendra Singh 29a38af143
Merge pull request #8 from jitendra-webkul/prashant
Prashant
2018-07-27 15:02:36 +05:30
jitendra 36d50061c7 Product Package Added 2018-07-27 15:00:48 +05:30
prashant-webkul 86a5cb93dd data grid bugs fixed 2018-07-27 12:20:25 +05:30
jitendra 5f7c432dc5 Channel and families completed 2018-07-27 11:52:12 +05:30
prashant-webkul 586b1d9779 Data Grid bugs removed 2018-07-25 19:42:35 +05:30
prashant-webkul fb1f042597 fixing modified changes 2018-07-24 20:12:36 +05:30
prashant-webkul 951266a100 datagrid mass action complete, customer packagge guard working, guards now defined in main auth.php file 2018-07-24 20:03:49 +05:30
jitendra 3a7ab61082 Currency, Exchange Rate completed 2018-07-24 16:41:32 +05:30
prashant-webkul 072990f6ed customer migrations and models 2018-07-20 20:45:21 +05:30
prashant-webkul e4581fc725 Mass actions working and created structure for customer package and removed some bugs from data grid and home page and made layouts for sign in and sign up package of customers and made the customer guard for customer also with model named customer 2018-07-20 20:37:16 +05:30
prashant-webkul 6da3b5bc83 Data Grid Complete, looking for issues and bugs now 2018-07-20 14:18:42 +05:30
prashant-webkul a7081205f8 Mass actions remaining, underlying structure for customer package is ready 2018-07-19 19:10:27 +05:30
prashant-webkul d68954a0e5 Datagrid Search Fixed 2018-07-19 10:48:15 +05:30
Prashant Singh b596eb1d1b more fixes on datagrid 2018-07-19 08:12:10 +05:30
Prashant Singh efa1e8b716 making and removing of filter tags is now working 2018-07-19 06:32:39 +05:30
prashant-webkul 8c1f72a9a1 Enable removal of filter and search and mass actions else find bugs and remove them. Applying filters is working fine now. 2018-07-18 19:38:46 +05:30
prashant-webkul c01ddc2ebb filters running dynamically, figure out sort and search now 2018-07-18 12:10:47 +05:30
prashant-webkul 54a36819a6 Data grid front implemented with columns and filters, last part of url encoder and decoder and sort ui events are remaining 2018-07-17 19:02:45 +05:30
jitendra c87f71427a Attribute Family Feature Added 2018-07-17 18:58:34 +05:30
prashant-webkul 74d1c3b3ea On the half way for UI part of the datagrid and only decode and encode of url is remaining 2018-07-16 14:34:03 +05:30
prashant-webkul 49583162f5 Grid now tested with joins also but some results with same column names are giving ambigous results 2018-07-16 10:32:20 +05:30
prashant-webkul 84e33e808e Case of aliasing on the columns is left to me made and tested else the filters are working properly with changed format for query string 2018-07-14 14:30:20 +05:30
prashant-webkul 82b0c3d3e0 Now fix aliasing and do solve all cases for alias validation also 2018-07-13 18:54:50 +05:30
prashant-webkul 9e0cf41e0c Datagrid format for url and filter by url query has changed and it is working decently 2018-07-13 18:18:59 +05:30
prashant-webkul 636062c481 Resolve the bugs left in filtering when join or without join aliasing is used 2018-07-12 13:51:32 +05:30
prashant-webkul 6e20306fbd storefront and datagrid 2018-07-12 12:53:31 +05:30
prashant-webkul 8e959dcbe1 Datagrid, storefront 2018-07-12 12:42:48 +05:30
jitendra 89a0a8a8d2 Attribute Package Added 2018-07-11 11:16:07 +05:30
jitendra ad3ff8d3f6 Attribute Package Added 2018-07-11 11:13:56 +05:30
jitendra 30a5784d75 Attribute Package Added 2018-07-11 11:11:27 +05:30
Nikhil ea7cffc2bc
Merge branch 'master' into nikhil 2018-07-06 15:20:34 +05:30
nikhil eb39d93241 datagird 2018-07-06 15:17:29 +05:30
jitendra 97b1cf0d0e Role Creation and Tree Vue Component Comnpleted 2018-07-05 13:28:26 +05:30
jitendra 79d303f54d Added User Role Feature 2018-07-02 14:59:27 +05:30
jitendra c9c090ea2b Flash Vue Component added 2018-06-26 18:25:09 +05:30
jitendra a0b1c524c9 UI package added 2018-06-25 16:30:42 +05:30
jitendra 9e98a727d2 Autoload issue fixed 2018-06-20 13:52:48 +05:30
jitendra 0470cb7ece Project skeleton added 2018-06-20 10:36:27 +05:30