Commit Graph

231 Commits

Author SHA1 Message Date
JItendra Singh 73ead1badf
Merge pull request #19 from bagisto/jitendra
Jitendra
2018-09-26 09:54:59 +05:30
jitendra 0bbda4158f Merged 2018-09-26 09:53:56 +05:30
JItendra Singh fec17d201a
Merge pull request #18 from bagisto/rahul
Rahul
2018-09-26 09:52:15 +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
JItendra Singh 4d0bc20820
Merge pull request #17 from bagisto/prashant
Prashant
2018-09-25 11:11:49 +05:30
prashant-webkul aeaf81f08b Merge with master on stage checkout 2018-09-25 11:08:40 +05:30
JItendra Singh c75b1330ef
Merge pull request #16 from bagisto/jitendra
cart shipping/billing address save
2018-09-25 10:53:29 +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
JItendra Singh 45a8611fa3
Merge pull request #15 from bagisto/prashant
Prashant
2018-09-21 15:51:28 +05:30
prashant-webkul fdb278c6da merging with master 2018-09-21 15:49:44 +05:30
JItendra Singh 4c89e334f5
Merge pull request #14 from bagisto/jitendra
Checkout shipping and payment steps added
2018-09-21 15:48:25 +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 Singh 40d481e64d
Merge pull request #12 from bagisto/jitendra
Check process fixed
2018-09-20 15:46:34 +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 Singh bd4f553a2c
Merge pull request #11 from bagisto/jitendra
Check process
2018-09-20 15:33:05 +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 670e466478 conflict 2018-09-19 15:25:01 +05:30
rahul shukla 1e2681adb3 product-detail page responsive 2018-09-19 15:22:10 +05:30
JItendra Singh 6dbdb9f306
Merge pull request #9 from bagisto/prashant
Prashant
2018-09-19 12:34:08 +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 Singh 919041da2b
Merge pull request #8 from bagisto/jitendra
Checkout page
2018-09-19 12:29:26 +05:30
jitendra acd048aaf6 Checkout page 2018-09-19 12:28:15 +05:30
prashant-webkul a122a8ea9f Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-09-17 15:13:39 +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