Commit Graph

169 Commits

Author SHA1 Message Date
rahul shukla 87e5e9a2bc checkout process 2018-09-13 16:46:47 +05:30
rahul shukla 58f12f7153 Merge branch 'master' of https://github.com/bagisto/bagisto 2018-09-13 16:41:07 +05:30
rahul shukla 1be2127591 checkout process 2018-09-13 16:40:45 +05:30
JItendra Singh 213944e9d9
Merge pull request #5 from bagisto/jitendra
Product detail page completed
2018-09-13 16:36:09 +05:30
jitendra 160f92b542 Product detail page completed 2018-09-13 16:34:56 +05:30
JItendra Singh 1a7f35b72d
Merge pull request #4 from bagisto/jitendra
Conflicts resolved
2018-09-11 16:12:30 +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 276e03169a Merge branch 'master' of https://github.com/bagisto/bagisto 2018-09-11 09:45:35 +05:30
rahul shukla b082d73707 customer edit/add & show in admin 2018-09-11 09:41:48 +05:30
JItendra Singh f7d5908705
Merge pull request #2 from bagisto/jitendra
Merge changes to master
2018-09-10 15:07:22 +05:30
jitendra 4fb084557d Commit to master 2018-09-10 15:04:57 +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 Singh 70ddd4a914
Merge pull request #28 from jitendra-webkul/jitendra
Product details page added
2018-08-30 18:53:32 +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 Singh 93078a7fbe
Merge pull request #27 from jitendra-webkul/jitendra
Repository pattern changes
2018-08-22 15:15:33 +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 Singh 0197103dc7
Merge pull request #26 from jitendra-webkul/jitendra
Customer Profile issues fixed
2018-08-22 12:58:21 +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
JItendra Singh 563b558ad9
Merge pull request #24 from jitendra-webkul/prashant
Prashant
2018-08-22 12:35:09 +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 Singh ab172592db
Merge pull request #23 from jitendra-webkul/jitendra
Issue fixed
2018-08-21 18:45:34 +05:30
jitendra 7c775a571e Issue fixed 2018-08-21 18:44:48 +05:30
JItendra Singh 15adb4218f
Merge pull request #22 from jitendra-webkul/prashant
Prashant
2018-08-21 16:36:46 +05:30
prashant-webkul eaf721f062 merging with master 2018-08-21 16:35:43 +05:30
JItendra Singh a850d5fbb9
Merge pull request #21 from jitendra-webkul/jitendra
For demo
2018-08-21 16:32:20 +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