6c0ee913ed
added mass actions in admin customers grid
2019-06-13 12:47:58 +05:30
ec27ed4c8d
added credit max in configuration
2019-06-13 01:05:29 +05:30
76e43dcd58
added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated
2019-06-12 01:05:24 +05:30
6a8c7a8784
assests compile for production
2019-06-11 16:40:13 +05:30
5b1f300abf
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-11 16:22:15 +05:30
22a81efdb3
fixed issue #1011
2019-06-11 14:51:28 +05:30
6b9be23cb0
fixed issue in cart rule for add condition button and exception while updating cart rule
2019-06-11 14:38:57 +05:30
de126e38ed
fixed issue with cart rule disc_quantity as validation was allowing zero at the time of creation
2019-06-11 12:32:34 +05:30
8e37ebe7d5
conflict resolve
2019-06-10 17:13:30 +05:30
80ac7bba72
customer document
2019-06-10 17:11:56 +05:30
0d3539f3c9
fixed validation issues in cart rule #993 & #997
2019-06-10 15:29:19 +05:30
6da603530e
Cart rule inside promotions, various improvements and fixes. ( #964 )
...
* Some syntax issue fixes
* Adding discount things inside promotions in admin
* routes updated for creating discount rules
* fixed customer profile redirect parameter issue
* added cart and catalog rule routes to admin section
* migrations for discount almost to be finished, final revision left
* migrations for discounts complete
* catalog rule form underway
* catalog rule
* Made some dynamic form fields in catalog rule create form
* made some changes for custom validations used in ProductForm request class
* working on prepopulating the values fields in conditions
* need another revisit on discount rules tables and then prepare for actions
* removed discounts table
* catalog rule form changed to muliti attribute set for single condition
* new icons added for promotion and customer note. new action for customer added to take notes on the customers
* catalog and cart rule designs stable, now moving towards validations on client side and backend
* catalog rules migrations added
* catalog rule models added with contracts and proxies
* fixed customer group bug in customer registration controller
* fixed customer registration bug due to last fix
* fixed product card image not found issue
* catalog rule translations added
* Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them.
* making cart attributes for cart rules
* Added more fields for cart rules
* working on conditions for cart rule form
* minor changes in migrations related to price rules
* currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel
* part of conditions on the cart rule form added
* daily sync
* cart rate migrations updated
* Added select and multi select attributes options fetching with ajax on catalog rule form
* changed some migrations and data being populated at runtime inside catalog rule form
* catalog rule create complete, migrations changes, translations added
* catalog rule edit form complete
* catalog rule form complete, now moving towards catalog rule products
* added delete functionality for catalog rules
* added cart rule preferences for coupon codes
* cart rule submission problem due to repository issue
* Cart rule form and migrations complete
* Models and Repositories updated for cart rule usage
* base sync with master
* designing process to get suitable discount rules
* cart rule form completed
* added helpers in cart and discount to apply rules on cart at checkout or not
* cart rule coupon implementation in progress for discount coupon in shop checkout pages
* cart rules working
* added coupon box on checkout screen
* removed the conditions empty bug
* Nearing to completion of coupon based rules
* made some changes in cart rule coupon application on checkout related to new designs
* some bug fixes
* calculation for automatic cart rules complete
* non couponable cart rules implemented, now moving on to binding them on frontend
* some conditions improvements in couponable cart rules
* some bug fixes
* removed some bugs from summary blade for cart rule
* added the table for cart rule cart for managing rules with cart and removed various bug fixes
* some bug fixes
* Removed bugs and added coupon based cart rule removal functionality
* some bug fixes
* cart rule labels refactoring in midway
* Cart rule labels bug fixed
* removed margin classes from shop to UI
* Refactoring cart rule on front end
* added checks
* Discount rule implemented.
* cart rule bug fixes
* provision to remove the couponable and non couponable rule had been added
* Cart rule frontend work done
* altered some frontend variables on onepage checkout
* Altered cart rules to some extent
2019-06-10 13:19:05 +05:30
9bb3c2def9
Merge pull request #977 from rahulshukla-webkul/development
...
Development
2019-06-06 17:47:37 +05:30
796e76564c
Merge pull request #974 from imanghafoori1/clean_up_config
...
clean up
2019-06-06 17:47:10 +05:30
99ccac943d
fix bug
2019-06-06 16:25:06 +04:30
b7b42ffc15
translation updated
2019-06-04 18:25:54 +05:30
9f039cb9a5
clean up
...
- optimized imports
- remove unused variable
- extract a method
- flatten code
2019-06-04 14:45:16 +04:30
68e01e85c2
Merge pull request #971 from imanghafoori1/clean_up_dashboard
...
Clean up
2019-06-04 14:21:19 +05:30
d232722b5d
issue #916
2019-06-04 12:49:10 +05:30
e0dd74c06c
clean up
2019-06-04 00:52:37 +04:30
ef2f9659f4
Merge pull request #959 from rahulshukla-webkul/development
...
configuration added to admin logo
2019-05-29 12:45:08 +05:30
573df3818c
configuration added to admin logo
2019-05-29 12:42:18 +05:30
3cec2d1935
Merge pull request #958 from rahulshukla-webkul/development
...
Development
2019-05-29 11:48:55 +05:30
fe8ac5abf1
issue #957 change in event
2019-05-29 09:56:28 +05:30
eee546da6a
Merge pull request #955 from rahulshukla-webkul/development
...
Development
2019-05-28 17:06:25 +05:30
7281cfeb78
issue #922
2019-05-28 13:32:13 +05:30
c4a9d04e72
file & image attribute
2019-05-27 16:51:27 +05:30
37ba923e9e
Backorder implemented
2019-05-24 18:45:47 +05:30
fb394d974c
Discount calculation added to the cart and discount added to the sales views
2019-05-23 18:44:16 +05:30
de5952bc36
issue #939
2019-05-23 13:06:31 +05:30
2d85b90e81
weight unit added in configuration
2019-05-22 19:40:36 +05:30
27812ccd15
shipping title & footer text
2019-05-22 18:45:47 +05:30
acfdd0f880
config field for password
2019-05-22 16:11:45 +05:30
7888656d4c
down icon & product edit icon
2019-05-21 20:11:36 +05:30
84b60e9081
comment of phone field in customer
2019-05-21 18:07:54 +05:30
2d782cab79
issue #917 & #923
2019-05-21 10:51:39 +05:30
f05d07eb38
issue #913 group in attribute family
2019-05-20 16:22:53 +05:30
afb0b99723
Email sent option added in mail notification
2019-05-17 16:05:30 +05:30
7931baab28
Email sent option added in mail notification
2019-05-17 15:31:39 +05:30
39ae415148
admin Navigation bar menu scroll issue fixed
2019-05-10 11:34:25 +05:30
d31179edaa
removal of space
2019-05-09 11:38:34 +05:30
4c2a895b08
Issue #897 & change in valdation message for category image
2019-05-09 11:36:21 +05:30
b52dc978e8
Admin section for IE & dyanamic footer content
2019-05-07 18:57:33 +05:30
1b3653348d
front end changes for IE
2019-05-06 20:52:43 +05:30
2816dd01e5
Merge branch 'master' into development
2019-05-01 22:38:42 +10:00
52bc554e31
Merge pull request #895 from prateek-webkul/development
...
admin mail notification, review price
2019-05-01 17:58:12 +05:30
8eea13db2d
utilise Mail::queue to send emails
2019-05-01 21:31:03 +10:00
f942415ebb
sort order for payment methods
2019-04-30 19:02:56 +05:30
4c101aa646
admin mail notification, review price
2019-04-30 12:55:11 +05:30
507a41546d
issue #890
2019-04-30 12:40:35 +05:30
cc3323c55d
issue #891 description issue
2019-04-29 15:51:15 +05:30
8019f49765
issue #879
2019-04-26 11:18:15 +05:30
5e6131102b
issue #866 & #845
2019-04-25 14:11:49 +05:30
75e74dfb7e
issue #867 shipment issue
2019-04-24 17:57:16 +05:30
c4eb615328
issue #842
2019-04-23 18:53:41 +05:30
e52c426600
dashboard & issue #841
2019-04-23 16:20:33 +05:30
7a5c3f1bdc
Assets compiled for production
2019-04-23 12:58:47 +05:30
148ff7c1e8
merge with master
2019-04-23 12:36:05 +05:30
025a34d99f
Merge pull request #857 from jitendra-webkul/jitendra
...
Issue #840 fixed
2019-04-23 10:33:58 +05:30
c585186a88
Issue #840 fixed
2019-04-23 10:33:10 +05:30
560d1fb0bc
issue #856
2019-04-22 20:52:36 +05:30
0239b7ec0b
issue #846
2019-04-18 20:22:37 +05:30
148f942c4a
issue #848
2019-04-18 19:15:14 +05:30
5b01493d26
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-18 13:04:10 +05:30
16b2b2a01f
scroller fixed
2019-04-18 12:58:35 +05:30
580d3ddf65
Resolve conflict
2019-04-18 12:56:36 +05:30
e99daf28e2
Issue #834 fixed
2019-04-18 12:52:51 +05:30
df8f54597a
scroller code removed
2019-04-17 12:30:50 +05:30
eb5bad16ff
removed code for scroller
2019-04-17 12:24:41 +05:30
ad6acfa7e0
issue #824
2019-04-16 20:15:28 +05:30
ae6d498f4c
merge with master
2019-04-16 19:22:49 +05:30
558b416bb6
Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development
2019-04-16 19:22:03 +05:30
095c045c58
change table of product datagrid to product_flat
2019-04-16 18:59:29 +05:30
a4bb5a036b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 15:55:42 +05:30
3984d92fad
Merge pull request #828 from prashant-webkul/development
...
Development
2019-04-16 15:46:32 +05:30
a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
...
Issue #803 fixed
2019-04-16 15:41:39 +05:30
eb00f36835
Issue #803 fixed
2019-04-16 15:40:58 +05:30
d568ea4bbe
merge with master
2019-04-16 15:35:54 +05:30
53ebbf5a1e
Removed product grid events, product grid table is now obselete and maybe used in future for someother purposes. In result we will have a faster product creation and a new grid will be added with product flat table
2019-04-16 14:47:28 +05:30
36f6c425c2
Assets compiled for production
2019-04-15 15:14:32 +05:30
feaaaa89a5
fixed some style issues
2019-04-14 15:30:43 +05:30
44c898824e
removed duplicate entry in product linking
2019-04-12 18:43:42 +05:30
2a859b7e23
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 15:08:15 +05:30
b99b0ad8b5
product attribute & category menu
2019-04-10 15:08:01 +05:30
f2def6c4bc
scroller issue fixed
2019-04-09 19:28:44 +05:30
b6a1a05e66
added permission of add & delete in acl
2019-04-09 18:52:03 +05:30
b0296a02e0
inventory source mail
2019-04-09 17:04:20 +05:30
1ca1ae5b61
Changed responses for all backend destroy functions and removed dead commented code
2019-04-09 13:17:19 +05:30
b3bf66c6e2
Base sync with master
2019-04-09 12:53:31 +05:30
75ef9cd530
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-09 12:50:09 +05:30
6c74b2ca42
admin assets compiled for production
2019-04-09 06:33:36 +05:30
6a4cb016c4
fixed issue #750
2019-04-09 06:31:52 +05:30
2df1a84191
Security fix underway need pull from other branches
2019-04-08 19:46:19 +05:30
efd38ab99e
issue #718
2019-04-08 19:33:23 +05:30
4bd89950ce
change update & delete query in controller & comment added
2019-04-08 16:48:43 +05:30
747f214739
fix in progress for get routes performing actions more than redirect
2019-04-08 04:51:02 +05:30
1e6579bedf
in fix
2019-04-05 19:38:44 +05:30
dadbf2bd6a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 10:47:16 +05:30
4c2a0a08fc
email subscription & newsletter verifiaction
2019-04-04 19:34:01 +05:30
5c94a8a21f
changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui
2019-04-04 14:50:59 +05:30
504a5ec038
issue fixed #791
2019-04-03 18:03:11 +05:30
1cb03f9ac3
admin scroller bug fixed
2019-04-03 15:23:12 +05:30
3dee0678f7
Merge pull request #788 from imanghafoori1/flatten_foreach
...
flatten code
2019-04-03 14:49:22 +05:30
d0e5e6a88f
Merge pull request #786 from imanghafoori1/flatten_code
...
Flatten code
2019-04-03 14:49:06 +05:30
759782c735
fix doc blocks ( #787 )
2019-04-03 12:34:35 +05:30
b655a848d7
admin scroller bug fixed
2019-04-03 12:17:23 +05:30
9314d9159c
Development ( #789 )
...
* issue #753 swatch issue
* edit validation for swatch
* #783 product image with installer
* issue #773
* removal of view composers in shop
2019-04-03 11:37:48 +05:30
fadd26bd13
flatten code
2019-04-02 22:10:34 +03:30
14cd4eb97e
flatten code
2019-04-02 21:50:44 +03:30
f2e4930e8e
admin nav left menu scroll bug fixed ( #784 )
...
* admin nav left menu scroll bug fixed
* scroller
* scroller
* fixed syntax for PR #784
2019-04-02 18:26:31 +05:30
1492022c20
fixed syntax for PR #784
2019-04-02 18:24:43 +05:30
896b4eebc3
scroller
2019-04-02 18:07:54 +05:30
594d4598a5
scroller
2019-04-02 18:03:12 +05:30
e0fc65b0da
admin nav left menu scroll bug fixed
2019-04-02 17:57:34 +05:30
09dbdb3fea
Merge pull request #776 from imanghafoori1/master
...
Flattened the code
2019-04-02 11:42:44 +05:30
2493b9e614
Provided amend in issue #705
2019-04-02 11:36:33 +05:30
80743dc19b
fixed issue #705
2019-04-02 11:34:45 +05:30
a84b81f446
flatten code
2019-04-01 18:39:15 +03:30
1a4c040894
remove unused code
2019-04-01 18:38:18 +03:30
84d4992944
issue #757
2019-04-01 18:06:16 +05:30
037126f82a
issue #757
2019-04-01 17:17:26 +05:30
06aa4dd6bf
Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses
2019-04-01 12:45:56 +05:30
91b4d1f955
fixed issue #761
2019-03-31 23:37:50 +05:30
0e1f26e835
fixed issue #763
2019-03-31 22:56:30 +05:30
ea99fc8c68
fixed issue 764
2019-03-31 22:41:14 +05:30
8af43eb5cc
session expiration time now changed to 10 minutes to counter XSRF requests
2019-03-30 18:14:54 +05:30
5346312ad0
revising issue #705
2019-03-30 16:50:53 +05:30
fc3c1a468b
fixed issue #705
2019-03-30 16:44:21 +05:30
68bb6a6149
issue #706
2019-03-28 20:20:00 +05:30
fef1b2d8da
Fixing of 3rd level menu issue for custom roles #705
2019-03-28 18:09:29 +05:30
0002f7caaa
issue #736
2019-03-28 12:50:00 +05:30
034deb05fc
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-28 10:35:24 +05:30
fa0a3ee4ee
issue #706
2019-03-27 20:13:43 +05:30
e9b511a92a
probable solution for 3 level menu bug
2019-03-26 16:00:37 +05:30
54d2a000c8
Fixing some issues and probably solving later
2019-03-25 15:59:37 +05:30
2a57530184
issue #735 & minor config changes for select
2019-03-22 14:54:46 +05:30
dca138ae85
issue #724
2019-03-22 11:58:11 +05:30
dc08bbc06e
installer issue
2019-03-20 15:09:24 +05:30
7ad8d567b1
Arabic translations added
2019-03-19 14:28:35 +05:30
97da404216
default channel now getting checked with admin
2019-03-19 13:22:06 +05:30
a34a2f2ba4
Merge pull request #714 from prashant-webkul/development
...
Development
2019-03-19 12:16:54 +05:30
40a0fa8cb0
Fixed issues #710 #709
2019-03-19 12:13:17 +05:30
41217e525f
Assets compiled for production
2019-03-15 19:31:23 +05:30
0a4fd97a0c
fixed issues with rtl
2019-03-15 17:14:13 +05:30
8b430988c4
assets compiled for production
2019-03-15 16:46:02 +05:30
d4f292490b
more probable solution for admin menu scrolling
2019-03-15 13:28:55 +05:30
2e9f58917f
Category display mode feature added
2019-03-15 13:08:21 +05:30
319e4edeb1
some more logic is required for proper scrolling of menu bar
2019-03-14 15:50:24 +05:30
556dd64327
removed some dead code
2019-03-14 12:06:51 +05:30
5fc85dffe4
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-14 11:01:04 +05:30
Prashant Singh
rahul shukla
Prashant Singh
Jitendra Singh
imanghafoori
jitendra
shaiv-webkul
prateek srivastava
Jiayu Shen
shenjiayu
naresh verma
rahulshukla-webkul
Prateek Srivastava