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
|
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
|
f1a0a2bcda
|
order
|
2018-10-15 16:15:29 +05:30 |
|
rahul shukla
|
5cc562d972
|
reviews
|
2018-10-15 14:32:26 +05:30 |
|
rahul shukla
|
8717edf059
|
customer pannel
|
2018-10-15 13:52:27 +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
|
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
|
0c47cbc282
|
Bug fixes
|
2018-10-12 13:52:21 +05:30 |
|
prashant-webkul
|
a631a07674
|
Bug fixes and cart operations optimization
|
2018-10-12 12:51:39 +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 |
|
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 |
|
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
|
79a4c85a1a
|
conflict
|
2018-10-08 10:07:51 +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 |
|
jitendra
|
a9106e0486
|
Order create
|
2018-10-05 11:48:58 +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
|
9cd738b95c
|
responsive css
|
2018-10-04 12:15:19 +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 |
|
prashant-webkul
|
0de154a4f2
|
merging with master
|
2018-10-01 12:14:14 +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
|
fe0ffca9ee
|
Cart Module Almost Completed
|
2018-09-28 18:25:48 +05:30 |
|
rahul shukla
|
c4a3cc19bd
|
header-responsive
|
2018-09-28 17:09:41 +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 |
|
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
|
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
|
54c5d5cb21
|
responsive
|
2018-09-24 16:11:18 +05:30 |
|
rahul shukla
|
ac39fca00e
|
responsive
|
2018-09-22 15:42:23 +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 |
|
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
|
31ae7c025e
|
Check process
|
2018-09-20 15:31:51 +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 |
|
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 |
|
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
|
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 |
|
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
|
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
|
4403fedc89
|
Before merge
|
2018-08-22 15:16:27 +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 |
|
jitendra
|
7e95b89ec8
|
For demo
|
2018-08-21 16:28:55 +05:30 |
|
jitendra
|
bde79be88e
|
Theme manager completed
|
2018-08-17 11:18:21 +05:30 |
|
jitendra
|
888a70c01c
|
gitignore updated
|
2018-08-01 11:47:48 +05:30 |
|
jitendra
|
f236da61ab
|
Added Repository Pattern to User
|
2018-07-31 13:20:54 +05:30 |
|
prashant-webkul
|
86a5cb93dd
|
data grid bugs fixed
|
2018-07-27 12:20:25 +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 |
|
jitendra
|
3a7ab61082
|
Currency, Exchange Rate completed
|
2018-07-24 16:41:32 +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
|
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
|
8e959dcbe1
|
Datagrid, storefront
|
2018-07-12 12:42:48 +05:30 |
|
jitendra
|
30a5784d75
|
Attribute Package Added
|
2018-07-11 11:11:27 +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 |
|
jitendra
|
a052c28459
|
First Commit
|
2018-06-12 10:04:00 +05:30 |