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 |