prashant-webkul
|
48bece3531
|
datagrid routes are dynamic for all the action types and mass actions also only two type of mass actions are used as of now single button type and select box type for updating boolean columns or may be incement or decrement in the numeric type columns, while there had a new icon for the orders, invoices and shipments datagrid and minor style bug fix on sales index screens, confirm text is not mandatory when clicking on actions now it can be disabled by commenting on the confirm_text in datagrid configurations, mass actions are also route dependent and can be enabled or disabled on specific grids also.
|
2018-12-03 13:41:35 +05:30 |
Ali Nazari
|
3ea703c367
|
optimized ExceptionHandler
|
2018-12-01 13:33:32 +03:30 |
Iman
|
264bc14ed3
|
Update TaxCategoryController.php
|
2018-12-01 10:48:19 +03:30 |
|
prashant-webkul
|
552bf4b1f9
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-11-30 20:38:15 +05:30 |
|
prashant-webkul
|
7fb67dc161
|
mass operations and datagrid operations normalization
|
2018-11-30 20:37:41 +05:30 |
jitendra
|
8ae76038fc
|
Category image issue fixed
|
2018-11-30 18:57:13 +05:30 |
|
jitendra
|
f0b1bcc6f4
|
Add to cart issue fixed
|
2018-11-30 14:51:35 +05:30 |
JItendra Singh
|
14b338556e
|
Merge pull request #251 from bagisto/prashant
Cart flash message fixed
|
2018-11-30 14:46:17 +05:30 |
|
JItendra Singh
|
83491fd612
|
Merge pull request #252 from bagisto/jitendra
Issue #247 (Displaying wrong number of products and sales in category…
|
2018-11-30 14:46:04 +05:30 |
|
prashant-webkul
|
1ba21f281d
|
Cart flash message fixed
|
2018-11-30 13:24:54 +05:30 |
|
prashant-webkul
|
36f6783db8
|
cart bug fixes and small css fix
|
2018-11-30 13:10:41 +05:30 |
|
jitendra
|
4e8081ed58
|
Issue #247 (Displaying wrong number of products and sales in category, on dashboard)
|
2018-11-30 12:15:10 +05:30 |
rahul shukla
|
984ff18267
|
merge with master
|
2018-11-29 18:13:45 +05:30 |
|
prashant-webkul
|
a6adfe679c
|
admin newsletter datagrid translation fixes
|
2018-11-29 18:08:37 +05:30 |
|
rahul shukla
|
bb310cd5c7
|
route change
|
2018-11-29 18:07:58 +05:30 |
|
prashant-webkul
|
5f81a79796
|
Subscription newsletter migration restored and subsctiption newsletter datagrid in admin
|
2018-11-29 18:05:56 +05:30 |
|
rahul shukla
|
64939485c5
|
merge with master
|
2018-11-29 17:52:25 +05:30 |
|
rahul shukla
|
e1b2d1eb01
|
export for customer
|
2018-11-29 17:39:39 +05:30 |
|
prashant-webkul
|
fad4bb83f7
|
enter key code enabled in datagrid search box
|
2018-11-29 15:58:42 +05:30 |
|
prashant-webkul
|
e1f7b4deff
|
datagrid issue fixes, some column aliases were using underscores due to a bug in symfony it was getting converted into dot, all the aliases are now underscore free
|
2018-11-29 15:40:23 +05:30 |
|
rahul shukla
|
77c501f170
|
dfd
|
2018-11-29 13:52:08 +05:30 |
|
rahul shukla
|
a0df76e775
|
search issue fixed
|
2018-11-29 13:43:52 +05:30 |
|
prashant-webkul
|
5de07d1b35
|
mini cart configurable options displaying all in bold now converted back to normal
|
2018-11-29 13:29:38 +05:30 |
|
prashant-webkul
|
b2161571bd
|
XSS fixes in datagrid where directly some columns were create html unescaped, migration fixes for products grid table, changelog added for past two releases v0.1.0 & v0.1.1
|
2018-11-29 13:20:50 +05:30 |
|
rahul shukla
|
bdfe3005b8
|
merge with master
|
2018-11-29 13:11:48 +05:30 |
|
rahul shukla
|
30ade42635
|
review changes
|
2018-11-29 13:03:50 +05:30 |
|
rahul shukla
|
41aae38b14
|
view all & customer name
|
2018-11-29 12:12:44 +05:30 |
|
jitendra
|
2422d93c76
|
Ajax CSRF token issue fixed
|
2018-11-29 10:29:17 +05:30 |
|
JItendra Singh
|
e56c47697e
|
Merge pull request #231 from bagisto/prashant
Order, order shipments full name fixes in datagrid
|
2018-11-28 17:16:55 +05:30 |
|
jitendra
|
7fa16f8be3
|
Issue #126 fixed (Add asterisk symbol on SKU field)
|
2018-11-28 17:15:57 +05:30 |
|
prashant-webkul
|
daf2bde541
|
Order, order shipments full name fixes in datagrid
|
2018-11-28 16:54:23 +05:30 |
|
jitendra
|
fe9e219334
|
Now raw expression will work on select raw dd(->columns);
|
2018-11-28 16:31:20 +05:30 |
|
JItendra Singh
|
c8acd1823d
|
Merge pull request #205 from bagisto/prashant
migration fixes for product grid and fixes in slider data grid and ta…
|
2018-11-28 16:15:31 +05:30 |
|
prashant-webkul
|
217c94d76b
|
migration fixes for product grid and fixes in slider data grid and tax categories datagrid
|
2018-11-28 16:10:48 +05:30 |
|
jitendra
|
4f2ebc4942
|
Assets compiled for production
|
2018-11-28 15:59:29 +05:30 |
|
JItendra Singh
|
a59d74ddfd
|
Merge pull request #198 from bagisto/prashant
column label and column removal in attributes and order shipments dat…
|
2018-11-28 15:14:18 +05:30 |
|
prashant-webkul
|
6f9c63e3ec
|
column label and column removal in attributes and order shipments datagrid
|
2018-11-28 15:13:24 +05:30 |
Prashant Singh
|
6758e05b95
|
Merge pull request #196 from bagisto/prashant
Prashant
|
2018-11-28 14:54:46 +05:30 |
|
prashant-webkul
|
311701b00a
|
tax category sync fix and select rates fixed
|
2018-11-28 14:05:44 +05:30 |
|
jitendra
|
0e38750e37
|
Issue #192 (Issue with different shipping address)
|
2018-11-28 13:30:41 +05:30 |
|
prashant-webkul
|
a29feaf83f
|
Email Subcription flow changed, email verfication enhancements for resending the email, reset password redirect issue solved and many other issue fixes
|
2018-11-28 12:59:08 +05:30 |
|
jitendra
|
db51f0df0e
|
Invoice status issue fixed
|
2018-11-28 12:44:04 +05:30 |
|
jitendra
|
230acb8b32
|
Issue #188 fixed (Customer group delete issue)
|
2018-11-28 12:41:17 +05:30 |
|
jitendra
|
8425098b2d
|
tinyMCE undefined variable issue fixed
|
2018-11-28 12:33:02 +05:30 |
|
jitendra
|
b57155eab3
|
Issue #151 fixed (Editor validation issue)
|
2018-11-28 11:43:38 +05:30 |
|
JItendra Singh
|
8ad380198d
|
Merge pull request #186 from bagisto/jitendra
Issue #133 fixed
Issue #175 fixed
Issue #176 fixed
Added bootstrap.js in main js file
|
2018-11-28 11:06:02 +05:30 |
|
jitendra
|
fafbcb432b
|
Issues #175, #176 fixed and added bootstrap.js in main js file
|
2018-11-28 10:56:54 +05:30 |
|
prashant-webkul
|
bf63545895
|
Bug fix for slider content field, changed to text and datagrid invoices and shipments columns added a/c to relevancy and removed mass actions
|
2018-11-27 18:56:25 +05:30 |
|
prashant-webkul
|
8b0c51c519
|
Validation messages fixes for client, product grid fixes, customer email verification fixes and changes, migration changes for customer gender columns and other isssues and bug fixes
|
2018-11-27 16:25:23 +05:30 |
|
Ali Nazari
|
0a973869c7
|
code improvement
|
2018-11-27 13:15:58 +03:30 |
|
jitendra
|
e416b97e84
|
Issue #133 fixed
|
2018-11-27 11:02:53 +05:30 |
|
jitendra
|
a9ef1269c3
|
Dashboard progress issues fixed
|
2018-11-27 10:53:47 +05:30 |
|
jitendra
|
82760de8d4
|
Issues #150 fixed
|
2018-11-27 10:44:13 +05:30 |
|
jitendra
|
c510e8ae47
|
Assets compiled for production
|
2018-11-27 10:23:33 +05:30 |
|
jitendra
|
fb0079bf42
|
Fixed validation error messages
|
2018-11-27 10:16:35 +05:30 |
|
prashant-webkul
|
f93716a801
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-11-26 10:27:07 +05:30 |
|
prashant-webkul
|
38378248d2
|
review apis
|
2018-11-26 10:26:59 +05:30 |
|
prashant-webkul
|
dbdf702a28
|
Product API for Storefront Completed
|
2018-11-25 20:51:21 +05:30 |
|
prashant-webkul
|
4e6c462317
|
onepage cart api implemented
|
2018-11-25 19:13:30 +05:30 |
|
prashant-webkul
|
be26ddf986
|
Storefront fixes in cart and minicart
|
2018-11-25 15:38:55 +05:30 |
|
prashant-webkul
|
59ff9cbb84
|
fixes in minicart
|
2018-11-25 15:33:43 +05:30 |
|
prashant-webkul
|
ed9a3baed9
|
Cart API completed
|
2018-11-24 19:24:54 +05:30 |
|
prashant-webkul
|
4455613180
|
Customer Wishlist API implemented
|
2018-11-24 15:26:31 +05:30 |
|
prashant-webkul
|
9ce3e53914
|
Fixed Bug in Tax Module
|
2018-11-23 16:22:19 +05:30 |
|
prashant-webkul
|
a497914241
|
Customer Registration API implemented
|
2018-11-22 22:17:20 +05:30 |
|
prashant-webkul
|
460b025b2b
|
customer profile old password match bug fixed
|
2018-11-22 22:00:10 +05:30 |
|
prashant-webkul
|
5b5006b809
|
Customer Address API for CRUD and getting and making the default address is complete
|
2018-11-22 20:21:37 +05:30 |
|
prashant-webkul
|
416d871cca
|
Changes in api, subscription and verification
|
2018-11-22 18:13:03 +05:30 |
|
jitendra
|
4c21d8ead6
|
Issues #134 fixed and Inventory source add/edit validation issue fixed
|
2018-11-21 16:44:07 +05:30 |
|
prashant-webkul
|
1c27444705
|
merged
|
2018-11-21 12:04:54 +05:30 |
|
jitendra
|
7758f450c6
|
Added more acl
|
2018-11-21 11:59:27 +05:30 |
|
prashant-webkul
|
662ff09a24
|
Bug Fixes
|
2018-11-21 11:59:18 +05:30 |
|
prashant-webkul
|
ab9328d755
|
Auth API implemented using JWT tokens, removed laravel passport
|
2018-11-19 17:04:13 +05:30 |
|
prashant-webkul
|
14997d6e97
|
OAuth Using Laravel Passport
|
2018-11-17 19:26:48 +05:30 |
|
prashant-webkul
|
98198a73fa
|
Buy Now Fixes
|
2018-11-17 11:56:10 +05:30 |
|
prashant-webkul
|
6f32272498
|
Subscription Mail Bug Fixes
|
2018-11-16 18:49:28 +05:30 |
|
prashant-webkul
|
82a3142c73
|
subscription mails bug fix
|
2018-11-16 18:28:41 +05:30 |
|
prashant-webkul
|
8c12e35621
|
Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid
|
2018-11-16 17:21:10 +05:30 |
|
jitendra
|
8e4d51af83
|
Typo fixed in ipn helper
|
2018-11-16 16:47:11 +05:30 |
|
jitendra
|
f0ef4f910a
|
Paypal Integration added
|
2018-11-16 15:41:08 +05:30 |
|
jitendra
|
c845fdddb8
|
Issues fixed
|
2018-11-13 15:43:09 +05:30 |
|
prashant-webkul
|
ede86c2d4d
|
Product Card UI fixes
|
2018-11-05 11:21:55 +05:30 |
|
prashant-webkul
|
eefb7dc9bc
|
Merged
|
2018-11-05 10:44:16 +05:30 |
|
prashant-webkul
|
3a801a5d72
|
Pre Loaded
|
2018-11-05 10:25:05 +05:30 |
|
jitendra
|
37625e2a2d
|
Assets compiled for production
|
2018-11-02 12:39:17 +05:30 |
|
jitendra
|
d958ac45b6
|
Assets compiled for production
|
2018-11-01 19:23:06 +05:30 |
|
jitendra
|
b182325772
|
Customer address form issues fixed, invoice print feature addred
|
2018-11-01 19:18:59 +05:30 |
|
rahul shukla
|
3924a0c943
|
rtl css
|
2018-11-01 19:15:54 +05:30 |
|
rahul shukla
|
d90a07f159
|
rtl css
|
2018-11-01 19:13:55 +05:30 |
|
rahul shukla
|
c80a2f4388
|
responsive product images
|
2018-10-31 20:01:43 +05:30 |
|
jitendra
|
3b4adf8b08
|
Assets merged for production
|
2018-10-31 12:54:50 +05:30 |
|
jitendra
|
bc67fe761a
|
Buy now and add to whislist issue fixed
|
2018-10-31 12:52:27 +05:30 |
|
jitendra
|
7ee3c3a972
|
Front search issue fixed
|
2018-10-30 19:56:11 +05:30 |
|
jitendra
|
eb327c309b
|
Email template logo issue fixed
|
2018-10-30 19:50:07 +05:30 |
|
jitendra
|
08ce4064e6
|
Assets compiled for production
|
2018-10-30 18:23:32 +05:30 |
|
jitendra
|
b67f40ddbc
|
Assets compiled for production
|
2018-10-30 18:21:11 +05:30 |
|
JItendra Singh
|
864efbce17
|
Merge pull request #108 from bagisto/rahul
Rahul
|
2018-10-30 18:18:39 +05:30 |
|
jitendra
|
e7ece582f1
|
Customer address issues fixed
|
2018-10-30 18:16:40 +05:30 |
|
rahul shukla
|
a677d5d553
|
alert on cart & move to wishlist
|
2018-10-30 18:14:00 +05:30 |
|
jitendra
|
ef462c8793
|
Merged with master
|
2018-10-30 17:08:05 +05:30 |
|
rahul shukla
|
84d5ecf41e
|
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
|
2018-10-30 17:05:41 +05:30 |
|
rahul shukla
|
ea4dcec84d
|
header
|
2018-10-30 17:03:52 +05:30 |
|
prashant-webkul
|
9369d54a3e
|
Merged and Migration fix
|
2018-10-30 17:03:13 +05:30 |
|
jitendra
|
376c1f9460
|
Assets compiled for production
|
2018-10-30 16:58:53 +05:30 |
|
jitendra
|
b4e79a87ca
|
Editor added to the product edit page, slider form page and channel create and edit form
|
2018-10-30 16:54:24 +05:30 |
|
prashant-webkul
|
a792f4e06b
|
Buy Now and Wishlist Complete
|
2018-10-30 16:52:36 +05:30 |
|
JItendra Singh
|
e42feb0fa9
|
Merge pull request #103 from bagisto/rahul
Rahul
|
2018-10-30 12:23:32 +05:30 |
|
rahul shukla
|
2517dfbf03
|
merge with master
|
2018-10-30 12:19:43 +05:30 |
|
JItendra Singh
|
c17961f1bc
|
Merge pull request #102 from bagisto/jitendra
minicart price currency format fixed
|
2018-10-30 12:16:40 +05:30 |
|
jitendra
|
7a521f97d7
|
minicart price currency format fixed
|
2018-10-30 12:16:08 +05:30 |
|
rahul shukla
|
6fea160abe
|
category image & currency , footer
|
2018-10-30 12:07:07 +05:30 |
|
prashant-webkul
|
13e56c1930
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-30 11:59:48 +05:30 |
|
prashant-webkul
|
f0c5db8177
|
before merge
|
2018-10-30 11:59:44 +05:30 |
|
jitendra
|
97c7ca84c6
|
Dashboard issue fixed
|
2018-10-30 11:58:15 +05:30 |
|
prashant-webkul
|
b55720244c
|
Move Configurable Item To Cart From Wishlist Bug Removed and Storefront UI Fix
|
2018-10-30 11:49:22 +05:30 |
|
prashant-webkul
|
e59f5a775b
|
Order Grid, Wishlist Bug Fixes
|
2018-10-30 10:01:01 +05:30 |
|
prashant-webkul
|
1cd59b4b86
|
Webkul copyright text, Search now working on product names only with a dedicated page for displaying results
|
2018-10-29 14:51:59 +05:30 |
|
rahul shukla
|
bcabb00e9a
|
Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul
|
2018-10-29 13:06:20 +05:30 |
|
rahul shukla
|
3c0c4481a2
|
conflict resolve
|
2018-10-29 13:05:57 +05:30 |
|
prashant-webkul
|
cd19e783e0
|
v-validate issue fixed
|
2018-10-29 13:04:41 +05:30 |
|
rahul shukla
|
35fdb45353
|
conflict
|
2018-10-29 11:44:12 +05:30 |
|
prashant-webkul
|
e2c036ced0
|
Search and Bug fixes
|
2018-10-29 11:39:09 +05:30 |
|
prashant-webkul
|
2514d748b5
|
Slider Content Bug Fixed
|
2018-10-28 18:53:20 +05:30 |
|
prashant-webkul
|
7a157ee17d
|
Slider Backend Fixed
|
2018-10-28 16:30:15 +05:30 |
|
prashant-webkul
|
f5b4cc4c46
|
tiny mce integration on the way
|
2018-10-27 19:05:01 +05:30 |
|
prashant-webkul
|
a643127eb3
|
Login page client validation issue fixed, login page wrong sign up translation issue fixed
|
2018-10-27 17:37:22 +05:30 |
|
prashant-webkul
|
18ff527319
|
Multiple addresses implemented for customer with the option of making the default address also, new radio button for checkout address selection made
|
2018-10-27 16:43:57 +05:30 |
|
rahul shukla
|
fe0e9a51bf
|
merge with master
|
2018-10-27 15:54:46 +05:30 |
|
rahul shukla
|
da7ab87fa2
|
customer changes
|
2018-10-27 15:48:03 +05:30 |
|
prashant-webkul
|
8e2d45e498
|
TinyMCE integration and Slider Content Fixes
|
2018-10-26 19:59:24 +05:30 |
|
rahul shukla
|
68e6e5bb79
|
loader
|
2018-10-26 19:29:53 +05:30 |
|
prashant-webkul
|
32af436609
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-26 19:15:54 +05:30 |
|
prashant-webkul
|
e3ce3ae45d
|
slider fixes
|
2018-10-26 19:15:51 +05:30 |
|
JItendra Singh
|
7d68e20de6
|
Merge pull request #93 from bagisto/prashant
Prashant
|
2018-10-26 19:14:05 +05:30 |
|
jitendra
|
27b1f1fad9
|
Issues fixed
|
2018-10-26 19:13:01 +05:30 |
|
prashant-webkul
|
5d3047a0b4
|
Cart bug fixes and order datagrid bug fixes
|
2018-10-26 17:53:25 +05:30 |
|
prashant-webkul
|
e5e2bf338e
|
Disabled buy now until next merge
|
2018-10-26 16:47:54 +05:30 |
|
jitendra
|
fbe8f844e1
|
Fixed seeders
|
2018-10-26 13:54:10 +05:30 |
|
jitendra
|
0231c26da2
|
Final Commit to first version
|
2018-10-26 13:16:18 +05:30 |
|
JItendra Singh
|
fd399c1661
|
Merge pull request #88 from bagisto/prashant
Prashant
|
2018-10-26 13:07:29 +05:30 |
|
prashant-webkul
|
17e4491956
|
Merged With Master
|
2018-10-26 13:00:08 +05:30 |
|
rahul shukla
|
80f37ff0cb
|
footer icon
|
2018-10-26 12:59:37 +05:30 |
|
prashant-webkul
|
74ba1afc64
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-26 12:58:52 +05:30 |
|
prashant-webkul
|
d56061539b
|
Bug fixes
|
2018-10-26 12:58:38 +05:30 |
|
jitendra
|
2d24f24c9c
|
Conflict resolved
|
2018-10-26 12:54:39 +05:30 |
|
rahul shukla
|
d9f4f73a58
|
conflict
|
2018-10-26 12:53:37 +05:30 |
|
jitendra
|
9c8c9c2a97
|
Now compiled asset will store in publishable folder
|
2018-10-26 12:52:43 +05:30 |
|
prashant-webkul
|
d267a5bb27
|
Bug fixes
|
2018-10-26 12:40:30 +05:30 |
|
prashant-webkul
|
462dc9fafb
|
Bug Fixes
|
2018-10-26 12:35:19 +05:30 |
|
rahul shukla
|
fef483cb62
|
footer icon
|
2018-10-26 12:32:46 +05:30 |
|
prashant-webkul
|
74605cbeff
|
storefront header fixed
|
2018-10-26 11:57:57 +05:30 |
|
rahul shukla
|
16fece01eb
|
link &n margin on review
|
2018-10-26 11:32:07 +05:30 |
|
jitendra
|
69ea3a1830
|
Product grid inventory update implemented after order created
|
2018-10-26 11:28:24 +05:30 |
|
prashant-webkul
|
cc9ad2c8ad
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-26 11:17:24 +05:30 |
|
prashant-webkul
|
f69e396bfd
|
Product grid update event bind successful
|
2018-10-26 11:14:42 +05:30 |
|
JItendra Singh
|
d25172baff
|
Merge pull request #81 from bagisto/jitendra
Issues fixed
|
2018-10-26 10:24:09 +05:30 |
|
jitendra
|
52bf973307
|
Issues fixed
|
2018-10-26 10:23:35 +05:30 |
|
rahul shukla
|
007f945b05
|
conflict resolve
|
2018-10-26 09:59:33 +05:30 |
|
prashant-webkul
|
d05b6451cc
|
Product grid bug fixes
|
2018-10-26 09:54:26 +05:30 |
|
jitendra
|
cc7b20e607
|
Merged
|
2018-10-26 09:51:39 +05:30 |
|
rahul shukla
|
c8fd85fe4b
|
conflict resolve
|
2018-10-26 09:50:46 +05:30 |
|
jitendra
|
7c63dac032
|
Fixed remaining issues
|
2018-10-26 09:50:43 +05:30 |
|
JItendra Singh
|
ee38c2be7f
|
Merge pull request #78 from bagisto/prashant
Prashant
|
2018-10-26 09:50:07 +05:30 |
|
prashant-webkul
|
7e75da7bdf
|
Product datagrid event binded with product create
|
2018-10-26 09:49:19 +05:30 |
|
rahul shukla
|
781b960fa8
|
reviews issue
|
2018-10-25 21:45:28 +05:30 |
|
prashant-webkul
|
021d918937
|
product datagrid event binding
|
2018-10-25 19:35:28 +05:30 |
|
prashant-webkul
|
55f6e2f29a
|
left with only the save product function for creating products datagrid
|
2018-10-25 19:29:34 +05:30 |
|
JItendra Singh
|
99a0590c69
|
Merge pull request #77 from bagisto/rahul
Rahul
|
2018-10-25 15:35:27 +05:30 |
|
prashant-webkul
|
dc939d4ff2
|
Addition data for adding configurable product to cart, fixed
|
2018-10-25 15:33:49 +05:30 |
|
prashant-webkul
|
ef37be5eca
|
Merge with master
|
2018-10-25 15:26:24 +05:30 |
|
jitendra
|
210da46a12
|
Issue fixed
|
2018-10-25 15:25:10 +05:30 |
|
rahul shukla
|
84ba1d4fc6
|
error changes
|
2018-10-25 14:36:51 +05:30 |
|
rahul shukla
|
af5b9d9f06
|
conflict resolve
|
2018-10-25 13:58:06 +05:30 |
|
prashant-webkul
|
1b83b23e53
|
merged with conflicted assets, recompile storefront
|
2018-10-25 13:51:03 +05:30 |
|
rahul shukla
|
c9037806b0
|
error pages
|
2018-10-25 13:50:30 +05:30 |
|
prashant-webkul
|
683b18e424
|
Cart Bug Fixes and Category items fixes for visible in menu only
|
2018-10-25 13:49:23 +05:30 |
|
rahul shukla
|
f281d01a53
|
error pages
|
2018-10-25 13:37:21 +05:30 |
|
jitendra
|
930cba9436
|
Issues fixed
|
2018-10-25 13:16:45 +05:30 |
|
jitendra
|
0f6bcfde49
|
Seeders added
|
2018-10-25 11:01:47 +05:30 |
|
rahul shukla
|
d1e49a2170
|
logo-img
|
2018-10-25 10:56:03 +05:30 |
|
rahul shukla
|
8d9627c194
|
customer changes
|
2018-10-25 10:38:51 +05:30 |
|
rahul shukla
|
52999c971e
|
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
|
2018-10-25 10:19:17 +05:30 |
|
JItendra Singh
|
2cdf0aedf0
|
Merge pull request #71 from bagisto/prashant
Prashant
|
2018-10-25 10:19:06 +05:30 |
|
prashant-webkul
|
b055a65d24
|
Customer password reset route
|
2018-10-25 10:18:14 +05:30 |
|
jitendra
|
c8e8240080
|
Merged Changes
|
2018-10-25 10:16:55 +05:30 |
|
rahul shukla
|
832d75485f
|
product review
|
2018-10-25 10:13:26 +05:30 |
|
jitendra
|
a95f56325c
|
Issue fixed
|
2018-10-25 09:44:23 +05:30 |
|
prashant-webkul
|
ec1ade3f57
|
Product Grid Autosync on Product Update Done
|
2018-10-23 18:47:28 +05:30 |
|
rahul shukla
|
de0ea34e8a
|
conflict resolve
|
2018-10-23 17:24:27 +05:30 |
|
rahul shukla
|
489c1cdd1b
|
customer group & responsive
|
2018-10-23 17:21:04 +05:30 |
|
prashant-webkul
|
2c32f510b2
|
merged with master
|
2018-10-23 17:19:13 +05:30 |
|
JItendra Singh
|
56e8597c6f
|
Merge pull request #68 from bagisto/jitendra
Dashboard completed
|
2018-10-23 17:16:22 +05:30 |
|
prashant-webkul
|
96b40bf2c3
|
Products DataGrid
|
2018-10-23 17:16:00 +05:30 |
|
jitendra
|
13ae5d58c0
|
Dashboard completed
|
2018-10-23 17:15:44 +05:30 |
|
prashant-webkul
|
5016e03b1c
|
Products datagrid mechanism is normailized to single table due to greate overhead in fetching total attributes for products.
|
2018-10-22 18:48:46 +05:30 |
|
prashant-webkul
|
701c8e3602
|
Wishlist move to cart code is tested and its working fine
|
2018-10-22 16:10:05 +05:30 |
|
rahul shukla
|
399ba55982
|
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
|
2018-10-22 11:18:29 +05:30 |
|
rahul shukla
|
5dc60d0fe1
|
customer group
|
2018-10-22 11:17:42 +05:30 |
|
prashant-webkul
|
1c78140272
|
Made the way to add configurable product to wishlist on the storefront.
|
2018-10-18 18:13:45 +05:30 |
|
prashant-webkul
|
371d2bb742
|
Wrote the code for moving configurable product to the wishlist
|
2018-10-18 17:42:41 +05:30 |
|
prashant-webkul
|
806ffb460f
|
Order Datagrid, Datagrid Currency Capabilities via wrapper and UI fixes in storefront navigation bar, admin panel menu item, datagrid actions checks before rendering of datagrid
|
2018-10-18 16:34:55 +05:30 |
|
prashant-webkul
|
d33b5c276e
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-18 15:52:47 +05:30 |
|
prashant-webkul
|
40ecc72b04
|
Merge pull request #67 from bagisto/jitendra
Jitendra
|
2018-10-18 15:52:22 +05:30 |
|
jitendra
|
1d5e1f5a21
|
Cart issues fixed
|
2018-10-18 15:21:08 +05:30 |
|
jitendra
|
70c47f44a9
|
Fixed cart issues
|
2018-10-18 15:01:19 +05:30 |
|
prashant-webkul
|
0b1f362d4b
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-18 14:00:31 +05:30 |
|
JItendra Singh
|
053b72e015
|
Merge pull request #66 from bagisto/jitendra
Badge css added in Ui
|
2018-10-18 13:59:16 +05:30 |
|
jitendra
|
ad2fa3a678
|
Badge css added in Ui
|
2018-10-18 13:58:35 +05:30 |
|
prashant-webkul
|
6865545172
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-18 13:50:46 +05:30 |
|
JItendra Singh
|
6c0dfa6a96
|
Merge pull request #65 from bagisto/jitendra
Front currency switcher, currency edit page and locale edit page added
|
2018-10-18 13:49:45 +05:30 |
|
jitendra
|
12d68fcb57
|
Front currency switcher, currency edit page and locale edit page added
|
2018-10-18 13:49:03 +05:30 |
|
rahul shukla
|
bd752c7e3e
|
conflict
|
2018-10-18 12:55:00 +05:30 |
|
prashant-webkul
|
db2b647de3
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-18 12:45:36 +05:30 |
|
prashant-webkul
|
51026b0dfd
|
Mergin
|
2018-10-18 12:45:32 +05:30 |
|
JItendra Singh
|
14140d647a
|
Merge pull request #64 from bagisto/jitendra
user on 404 page fixed
|
2018-10-18 11:55:13 +05:30 |
|
jitendra
|
258262935a
|
user on 404 page fixed
|
2018-10-18 11:54:36 +05:30 |
|
rahul shukla
|
e91d6f184b
|
loader css change
|
2018-10-18 11:00:04 +05:30 |
|
JItendra Singh
|
e2229bc634
|
Merge pull request #63 from bagisto/prashant
Prashant
|
2018-10-18 10:46:46 +05:30 |
|
rahul shukla
|
7fe85d0549
|
loader changes
|
2018-10-18 10:45:35 +05:30 |
|
rahul shukla
|
b5be4cf320
|
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
|
2018-10-18 10:33:45 +05:30 |
|
rahul shukla
|
dde2a626e6
|
laoder changes
|
2018-10-18 10:33:00 +05:30 |
|
jitendra
|
ef69538ccb
|
Refactor css
|
2018-10-18 10:25:45 +05:30 |
|
prashant-webkul
|
c670891b4f
|
Customer Password Resets Migration File
|
2018-10-17 20:01:12 +05:30 |
|
prashant-webkul
|
3a1029290f
|
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
|
2018-10-17 19:50:55 +05:30 |
|
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 |
|
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 |
|
prashant-webkul
|
3da39943f1
|
Datagrid bug fixes
|
2018-08-16 13:37:37 +05:30 |
|
prashant-webkul
|
bb3551a564
|
Datagrid bug fixes
|
2018-08-16 12:52:42 +05:30 |
|
prashant-webkul
|
238b2fb20c
|
DataGrid filters now restricted to one per one column
|
2018-08-16 12:45:54 +05:30 |
|
prashant-webkul
|
21a16b8cf0
|
Refactored the code for datagrid from view composers to selft dependent injection classes and storefront views directory structure is segregated.
|
2018-08-16 11:35:45 +05:30 |
|
prashant-webkul
|
e9d6b93242
|
layouting for two pages product review and cart page has been done
|
2018-08-14 19:15:11 +05:30 |
|
prashant-webkul
|
2e4fc2f8a3
|
Product details page layout complete
|
2018-08-13 19:14:04 +05:30 |
|
prashant-webkul
|
e173f9c7e6
|
Slider animations and transition working.
|
2018-08-13 14:39:40 +05:30 |
|
prashant-webkul
|
282d8695bc
|
Slider now working now make it responsive
|
2018-08-10 14:58:35 +05:30 |
|
prashant-webkul
|
9e960ec0ad
|
Merging with master
|
2018-08-09 17:44:36 +05:30 |
|
jitendra
|
53357c17c9
|
Product Image Upload Added
|
2018-08-09 17:37:56 +05:30 |
|
prashant-webkul
|
e480a7c625
|
Slider on store front implemented with html content, css and transition animations left
|
2018-08-09 17:30:26 +05:30 |
|
prashant-webkul
|
fb1daf8fbc
|
Validations normalized
|
2018-08-09 12:49:33 +05:30 |
|
prashant-webkul
|
f8aba20be9
|
validation added in customer sign in and register pages
|
2018-08-09 12:01:54 +05:30 |
|
prashant-webkul
|
7701805d9b
|
made the translations for customer login and sign up page, more tranlation strings coming up in next commits
|
2018-08-09 11:30:51 +05:30 |
|
prashant-webkul
|
4b6bb9540f
|
Merged with master
|
2018-08-09 10:06:51 +05:30 |
|
prashant-webkul
|
73d044a4f9
|
Sliders grid now joined with channels
|
2018-08-09 10:05:32 +05:30 |
|
jitendra
|
ff50784aa8
|
Added product creation page
|
2018-08-09 10:05:13 +05:30 |
|
prashant-webkul
|
8406da969d
|
Slider layers now working, datagrid on slider working
|
2018-08-08 19:17:40 +05:30 |
|
prashant-webkul
|
3fa134ca16
|
Datagrid Integration in Settings done.
|
2018-08-08 15:07:04 +05:30 |
|
prashant-webkul
|
2c90d713af
|
Datagrid working without dots in the URL, next is to put the validation for valid aliasing if aliasing is used and set true
|
2018-08-08 11:03:23 +05:30 |
|
prashant-webkul
|
7ddcba62f9
|
Datagrid fallback to new URL format
|
2018-08-07 18:57:59 +05:30 |
|
prashant-webkul
|
6b54f4d526
|
pagination working, non aliasing bugs removed, datagrid working good
|
2018-08-06 19:51:11 +05:30 |
|
prashant-webkul
|
2f3b0179d6
|
Non aliased case bug removed
|
2018-08-06 17:11:20 +05:30 |
|
prashant-webkul
|
2e70b577a2
|
Non Aliased case working
|
2018-08-06 16:53:45 +05:30 |
|
prashant-webkul
|
ce1a3ebad6
|
Bug fixes and UI touchups in DataGrid
|
2018-08-06 15:21:24 +05:30 |
|
prashant-webkul
|
7c5253aec2
|
Slider Configuration in works ready to save slider images in next commit
|
2018-08-03 20:20:13 +05:30 |
|
prashant-webkul
|
7a7cacf515
|
fixes and style changes
|
2018-08-02 20:28:12 +05:30 |
|
prashant-webkul
|
cc37e352a8
|
Icons fixed in storefront
|
2018-08-02 13:16:48 +05:30 |
|
prashant-webkul
|
fad5944bf7
|
Merge branch 'master' of https://github.com/jitendra-webkul/bagisto into prashant
|
2018-08-02 13:14:07 +05:30 |
|
jitendra
|
94cfd31e64
|
date issue fixed
|
2018-08-02 13:13:04 +05:30 |
|
prashant-webkul
|
f035006aef
|
merging the changes with master
|
2018-08-02 13:04:54 +05:30 |
|
prashant-webkul
|
ec8fdeca6f
|
data grid empty values in filters redirecting to exception is now fixed.
|
2018-08-02 12:59:54 +05:30 |
|
jitendra
|
f99d9ebcad
|
Product edit page added with all attribuite type fields
|
2018-08-02 09:49:45 +05:30 |
|
prashant-webkul
|
9e3c3a357a
|
Front category navigation and store front account dropdown complete
|
2018-08-01 20:30:31 +05:30 |
|
prashant-webkul
|
42848e7476
|
Category Navigation in the store front done with few style touch ups left
|
2018-08-01 11:52:13 +05:30 |
|
prashant-webkul
|
c4aa34430f
|
Navigation Category Menu working, with little css makeover will be innext commit
|
2018-08-01 11:43:51 +05:30 |
|
jitendra
|
71fd4a6237
|
Product page
|
2018-08-01 11:41:33 +05:30 |
|
prashant-webkul
|
49d6d440e5
|
navigation menu category ready, styles left to be applied accordingly
|
2018-07-31 15:52:38 +05:30 |
|
jitendra
|
f236da61ab
|
Added Repository Pattern to User
|
2018-07-31 13:20:54 +05:30 |
|
prashant-webkul
|
9de89a319d
|
Implemented the category composer for header in shop bundle and removed some bugs
|
2018-07-30 19:51:06 +05:30 |
|
prashant-webkul
|
1442733f30
|
store front slide and segregation of view templates
|
2018-07-28 18:33:47 +05:30 |
|
prashant-webkul
|
6910ca47f5
|
Customer account's side menu now being generated dynamically
|
2018-07-28 15:15:33 +05:30 |
|
prashant-webkul
|
15043a249b
|
Edit form, logout route for customer
|
2018-07-27 19:07:56 +05:30 |
|
prashant-webkul
|
587aaf3961
|
Customer package for wrong hint path for view fixed
|
2018-07-27 15:45:28 +05:30 |
|
prashant-webkul
|
f119f95ed7
|
Migrations fixed for customers
|
2018-07-27 15:38:04 +05:30 |
|
prashant-webkul
|
1358a6a27d
|
Moved assets and views from customers to shop
|
2018-07-27 15:14:51 +05:30 |
|
jitendra
|
e65aab372d
|
Vendor removed from customer
|
2018-07-27 15:11:26 +05:30 |
|
jitendra
|
21a9257d3f
|
Vendor removed from customer
|
2018-07-27 15:10:25 +05:30 |
|
jitendra
|
b38e926178
|
Vendor removed from customer
|
2018-07-27 15:07:47 +05:30 |
|
jitendra
|
4431e5ce0e
|
Vendor removed from customer
|
2018-07-27 15:05:56 +05:30 |
|
jitendra
|
b68cc29c68
|
Vendor removed from customer
|
2018-07-27 15:04:50 +05:30 |
|
JItendra Singh
|
29a38af143
|
Merge pull request #8 from jitendra-webkul/prashant
Prashant
|
2018-07-27 15:02:36 +05:30 |
|
jitendra
|
36d50061c7
|
Product Package Added
|
2018-07-27 15:00:48 +05:30 |
|
prashant-webkul
|
86a5cb93dd
|
data grid bugs fixed
|
2018-07-27 12:20:25 +05:30 |
|
jitendra
|
5f7c432dc5
|
Channel and families completed
|
2018-07-27 11:52:12 +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 |
|
prashant-webkul
|
951266a100
|
datagrid mass action complete, customer packagge guard working, guards now defined in main auth.php file
|
2018-07-24 20:03:49 +05:30 |
|
jitendra
|
3a7ab61082
|
Currency, Exchange Rate completed
|
2018-07-24 16:41:32 +05:30 |
|
prashant-webkul
|
072990f6ed
|
customer migrations and models
|
2018-07-20 20:45:21 +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
|
a7081205f8
|
Mass actions remaining, underlying structure for customer package is ready
|
2018-07-19 19:10:27 +05:30 |
|
prashant-webkul
|
d68954a0e5
|
Datagrid Search Fixed
|
2018-07-19 10:48:15 +05:30 |
Prashant Singh
|
b596eb1d1b
|
more fixes on datagrid
|
2018-07-19 08:12:10 +05:30 |
|
Prashant Singh
|
efa1e8b716
|
making and removing of filter tags is now working
|
2018-07-19 06:32:39 +05:30 |
|
prashant-webkul
|
8c1f72a9a1
|
Enable removal of filter and search and mass actions else find bugs and remove them. Applying filters is working fine now.
|
2018-07-18 19:38:46 +05:30 |
|
prashant-webkul
|
c01ddc2ebb
|
filters running dynamically, figure out sort and search now
|
2018-07-18 12:10:47 +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
|
74d1c3b3ea
|
On the half way for UI part of the datagrid and only decode and encode of url is remaining
|
2018-07-16 14:34:03 +05:30 |
|
prashant-webkul
|
49583162f5
|
Grid now tested with joins also but some results with same column names are giving ambigous results
|
2018-07-16 10:32:20 +05:30 |
|
prashant-webkul
|
84e33e808e
|
Case of aliasing on the columns is left to me made and tested else the filters are working properly with changed format for query string
|
2018-07-14 14:30:20 +05:30 |
|
prashant-webkul
|
82b0c3d3e0
|
Now fix aliasing and do solve all cases for alias validation also
|
2018-07-13 18:54:50 +05:30 |
|
prashant-webkul
|
9e0cf41e0c
|
Datagrid format for url and filter by url query has changed and it is working decently
|
2018-07-13 18:18:59 +05:30 |
|
prashant-webkul
|
636062c481
|
Resolve the bugs left in filtering when join or without join aliasing is used
|
2018-07-12 13:51:32 +05:30 |
|
prashant-webkul
|
6e20306fbd
|
storefront and datagrid
|
2018-07-12 12:53:31 +05:30 |
|
prashant-webkul
|
8e959dcbe1
|
Datagrid, storefront
|
2018-07-12 12:42:48 +05:30 |
|
jitendra
|
89a0a8a8d2
|
Attribute Package Added
|
2018-07-11 11:16:07 +05:30 |
|
jitendra
|
ad3ff8d3f6
|
Attribute Package Added
|
2018-07-11 11:13:56 +05:30 |
|
jitendra
|
30a5784d75
|
Attribute Package Added
|
2018-07-11 11:11:27 +05:30 |
Nikhil
|
ea7cffc2bc
|
Merge branch 'master' into nikhil
|
2018-07-06 15:20:34 +05:30 |
nikhil
|
eb39d93241
|
datagird
|
2018-07-06 15:17:29 +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 |