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

454 Commits

Author SHA1 Message Date
prashant-webkul 8c7626b2b2 before merge 2018-10-17 19:50:25 +05:30
jitendra b02d87626a Get current channel code updated 2018-10-17 19:27:51 +05:30
prashant-webkul 84bc6c0c60 merged 2018-10-17 16:17:46 +05:30
jitendra 9756480f42 Theme issue fixed 2018-10-17 16:17:03 +05:30
prashant-webkul 11e7db8f85 Before merge with masteer 2018-10-17 16:03:57 +05:30
jitendra b0a12d85a3 COnflict resloved 2018-10-17 16:03:25 +05:30
jitendra faab00c3b8 Bug fixed 2018-10-17 16:00:31 +05:30
rahul shukla 2a96a3ee71 merge master 2018-10-17 15:18:34 +05:30
rahul shukla 541264f86a Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-17 15:16:35 +05:30
JItendra Singh db0f32ac37
Merge pull request #57 from bagisto/jitendra 
Channel logo and favicon implementation added
 2018-10-17 15:16:01 +05:30
jitendra 892bf53cc9 Channel logo and favicon implementation added 2018-10-17 15:15:18 +05:30
rahul shukla b329567370 conflict 2018-10-17 15:14:22 +05:30
rahul shukla 8009b5c647 error & loader 2018-10-17 13:10:08 +05:30
prashant-webkul 5fb2f78039 Merged with Master 2018-10-17 12:56:34 +05:30
prashant-webkul 3a3c89484d before merge 2018-10-17 12:53:01 +05:30
jitendra d3b73f517c Sales email templates added 2018-10-17 12:51:47 +05:30
prashant-webkul c05ea63603 Before Merge 2018-10-17 12:30:48 +05:30
prashant-webkul ddc57abdfa Datagrid UI and Configuration fixes 2018-10-17 11:27:40 +05:30
prashant-webkul f195b335b6 Data Grid Configuration Fixes 2018-10-16 18:56:30 +05:30
prashant-webkul 91a4fabcfb Grid Sort Fixes 2018-10-16 17:18:45 +05:30
prashant-webkul 3a17aacd90 Wishlist Move To Cart For Simple Products Done 2018-10-15 20:18:58 +05:30
prashant-webkul 2f427d1550 After merge 2018-10-15 17:21:03 +05:30
prashant-webkul 8784fffe92 before merge 2018-10-15 17:19:28 +05:30
rahul shukla ec03cbd63e conflict resolve 2018-10-15 16:16:50 +05:30
rahul shukla f1a0a2bcda order 2018-10-15 16:15:29 +05:30
jitendra 7f1675e37c Order cancel implemented 2018-10-15 16:09:09 +05:30
rahul shukla 5cc562d972 reviews 2018-10-15 14:32:26 +05:30
prashant-webkul 2613f9b93f Account pages for the customer fixed 2018-10-15 14:07:29 +05:30
rahul shukla 8717edf059 customer pannel 2018-10-15 13:52:27 +05:30
prashant-webkul 4bd252edde Customer account layout bug fixes 2018-10-15 13:51:42 +05:30
prashant-webkul f5188d4b83 Customer account styles generalized 2018-10-15 13:50:37 +05:30
rahul shukla ba2ad4bd28 customer fixes 2018-10-15 10:22:00 +05:30
prashant-webkul 1bf6ce539e Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 18:35:04 +05:30
jitendra e92010f55f Tax issue fixed 2018-10-12 18:34:15 +05:30
prashant-webkul b33d7c1aa1 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 
Countries and States list component to be devised for system wide usage.
 2018-10-12 18:24:58 +05:30
prashant-webkul a7e813ff0d Before merge 2018-10-12 18:24:13 +05:30
jitendra 1e16931ba3 Countries and States models added 2018-10-12 18:24:10 +05:30
rahul shukla c857dde9f4 customer validation 2018-10-12 17:09:19 +05:30
rahul shukla 8544d9705a conflict 2018-10-12 17:01:14 +05:30
prashant-webkul 676aeb3217 UI and System fixes 2018-10-12 16:45:55 +05:30
prashant-webkul 7319a8c40a Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 13:53:22 +05:30
prashant-webkul 0c47cbc282 Bug fixes 2018-10-12 13:52:21 +05:30
jitendra 71ea17d9d7 Performence Optimized 2018-10-12 13:52:06 +05:30
prashant-webkul a631a07674 Bug fixes and cart operations optimization 2018-10-12 12:51:39 +05:30
prashant-webkul 9df49c07d3 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 09:55:48 +05:30
prashant-webkul f28f716d9f Bug fixes across the system 2018-10-11 19:55:59 +05:30
rahul shukla 247bb41812 conflict 2018-10-11 16:23:23 +05:30
rahul shukla 5a71127c4e Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul 2018-10-11 15:23:44 +05:30
rahul shukla b6fda43b38 conflict 2018-10-11 15:23:29 +05:30
prashant-webkul 2378d2bdd2 layout changes 2018-10-11 15:22:25 +05:30
JItendra Singh 7a7e25b11d
Merge pull request #48 from bagisto/jitendra 
Tax calculation
 2018-10-11 11:43:49 +05:30
jitendra 1b06082e2e Tax calculation 2018-10-11 11:42:39 +05:30
prashant-webkul 60c930c401 Merged w/ master 2018-10-11 11:12:17 +05:30
jitendra 392ceadf53 Refactor cart 2018-10-11 11:09:17 +05:30
prashant-webkul d26758e49a Merged 2018-10-10 16:13:51 +05:30
prashant-webkul 34d4a1c3a4 Before Merge 2018-10-10 16:11:33 +05:30
jitendra 6f57a51152 Fixed cart issues 2018-10-10 15:56:27 +05:30
JItendra Singh 503f0e0a5a
Merge pull request #44 from bagisto/jitendra 
Home new products
 2018-10-10 11:22:19 +05:30
jitendra 426933a4bb Home new products 2018-10-10 11:20:47 +05:30
rahul shukla cf02c148a8 removing conflict 2018-10-10 11:18:45 +05:30
rahul shukla 17f133ca07 removing offerzone 2018-10-10 11:16:18 +05:30
rahul shukla bb92be967b product responsive & loader 2018-10-10 11:08:19 +05:30
prashant-webkul b6df4e1dc8 Merged with master 2018-10-10 10:19:30 +05:30
prashant-webkul 36102ac040 Bug fixes in tax rate and categories 2018-10-09 17:34:25 +05:30
jitendra d00bb078a1 Shipment and invoice creation completed 2018-10-09 17:32:22 +05:30
rahul shukla e887b27e7d nav-responsive 2018-10-08 13:46:17 +05:30
rahul shukla 05a4f84882 conflict 2018-10-08 10:01:17 +05:30
rahul shukla c1d73dfb32 responsive 2018-10-06 15:04:23 +05:30
prashant-webkul 301eb1959f merged with master 2018-10-05 17:38:42 +05:30
prashant-webkul 70da40c855 Before merge wishlist in progress 2018-10-05 17:30:48 +05:30
jitendra f87a47d798 Order creation completed 2018-10-05 17:29:43 +05:30
prashant-webkul 0177d889c3 Merged with master 2018-10-05 11:53:00 +05:30
prashant-webkul c9da9491a6 Before merge 2018-10-05 11:49:30 +05:30
jitendra a9106e0486 Order create 2018-10-05 11:48:58 +05:30
prashant-webkul e86d78dc3f Wishlist Started to be done as an universal component 2018-10-04 20:28:38 +05:30
prashant-webkul adc7052afa Cart Dependency Resolved From Composer to Global helpers and removed the form field check for the cart operations of add, remove and update 2018-10-04 19:46:23 +05:30
prashant-webkul 9018d5cadf Cart Bug Fixes 2018-10-04 16:22:59 +05:30
prashant-webkul fc7cfd7d81 Cart Bug fixes -> Cart page intolerant to totals, fixed by executing helpers before redirecting on success. 2018-10-04 15:58:44 +05:30
rahul shukla 58ad8184eb conflict resolve 2018-10-04 12:32:30 +05:30
rahul shukla d1d9768f80 conflict resolve 2018-10-04 12:25:35 +05:30
prashant-webkul 1c667b332c Merged with master 2018-10-04 12:24:32 +05:30
rahul shukla a21c41be6a conflict 2018-10-04 12:23:38 +05:30
rahul shukla 9cd738b95c responsive css 2018-10-04 12:15:19 +05:30
prashant-webkul 3fffbacb49 Before merge 2018-10-04 12:13:49 +05:30
jitendra c235c22e79 Order creation 2018-10-04 12:12:06 +05:30
prashant-webkul e6e71a7128 responsive fixes 2018-10-03 18:21:17 +05:30
prashant-webkul a5123fb3b6 Storefront fixes 2018-10-03 16:26:49 +05:30
rahul shukla 028b0f59f7 conflict resolve 2018-10-03 16:25:54 +05:30
rahul shukla 60e1208e19 responsive ctegory 2018-10-03 16:02:46 +05:30
prashant-webkul 519c2e4815 Cart Dropdown, Responsive improvements for product grids at various places. 2018-10-03 16:01:33 +05:30
rahul shukla a6135dd703 Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul 2018-10-01 15:00:11 +05:30
rahul shukla 323c073a5c responsive 2018-10-01 15:00:05 +05:30
prashant-webkul 6618d6a7e0 Responsive layouts 2018-10-01 14:49:11 +05:30
rahul shukla ccba2eb6a2 prashant 2018-10-01 13:58:06 +05:30
prashant-webkul 860d55bc38 Layout normalized 2018-10-01 13:56:27 +05:30
rahul shukla 5a582da417 responsive 2018-10-01 13:19:04 +05:30
prashant-webkul 8d9adb32d3 SASS structurization 2018-10-01 13:17:15 +05:30
jitendra c1a657f3c8 Configurable option on cart page 2018-10-01 12:37:46 +05:30
prashant-webkul 45ed88c4e6 re-merge 2018-10-01 12:36:59 +05:30
prashant-webkul aa7f380ec3 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-01 12:27:04 +05:30
prashant-webkul 0de154a4f2 merging with master 2018-10-01 12:14:14 +05:30
JItendra Singh 2c3a505fc6
Merge pull request #32 from bagisto/prashant 
Cart Bugs Fixes
 2018-10-01 12:09:26 +05:30
jitendra f57e0c6720 Configurable option on cart page 2018-10-01 12:07:32 +05:30
rahul shukla 00b31edd81 Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul 2018-09-28 19:56:59 +05:30
rahul shukla 368cf864a7 reponsive header 2018-09-28 19:54:55 +05:30
prashant-webkul f69b000052 Cart Bugs Fixes 2018-09-28 19:44:54 +05:30
prashant-webkul 34833ff995 Path Errors Fixed 2018-09-28 18:58:54 +05:30
prashant-webkul 41fb4a6407 Merged with Master 2018-09-28 18:39:42 +05:30
prashant-webkul fe0ffca9ee Cart Module Almost Completed 2018-09-28 18:25:48 +05:30
jitendra 0bb851d518 Sale package schema added and renamed package cart to checkout 2018-09-28 18:24:26 +05:30
rahul shukla c4a3cc19bd header-responsive 2018-09-28 17:09:41 +05:30
prashant-webkul 2328d5e98b Cart Working, manual test before next commit 2018-09-28 00:34:56 +05:30
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