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
66bd3e7989
Optional index for datagrid action
2019-06-07 17:59:38 +05:30
5585b503cf
Car controller updated
2019-06-07 16:36:50 +05:30
ca4d9ef9ba
Fixed js issue buy now button not exist
2019-06-07 15:42:58 +05:30
c6a44b5414
Updated cart for custom_price
2019-06-07 11:18:46 +05:30
87542306a2
Merge pull request #980 from rahulshukla-webkul/development
...
Development
2019-06-07 11:14:43 +05:30
dc96dfb7b2
custom price default to null
2019-06-07 11:12:40 +05:30
f924e7ed01
custom price nullable in cart items
2019-06-07 10:06:00 +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
d399811206
Merge pull request #978 from jitendra-webkul/jitendra
...
totalQuantity function added to product and product flat model
2019-06-06 16:44:31 +05:30
2d00679901
totalQuantity function added to product and product flat model
2019-06-06 16:43:36 +05:30
af67516c36
object added with event
2019-06-06 15:16:16 +05:30
b7b42ffc15
translation updated
2019-06-04 18:25:54 +05:30
255664c4c0
back button implemented on checkout page
2019-06-04 16:36:42 +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
40e8c85813
issue #945 product image of variant
2019-06-04 10:17:00 +05:30
e0dd74c06c
clean up
2019-06-04 00:52:37 +04:30
93324e021e
issue #896 product special price
2019-06-03 17:11:11 +05:30
fc456c785f
issue #850
2019-06-03 16:29:00 +05:30
4ed068b00b
Merge pull request #967 from jitendra-webkul/jitendra
...
Fixed mini cart layout
2019-05-31 18:31:41 +05:30
96e8556b54
Fixed mini cart layout
2019-05-31 18:30:09 +05:30
fa87ecab3d
Merge pull request #966 from jitendra-webkul/jitendra
...
Issue #932 fixed
2019-05-31 17:54:26 +05:30
8202f58284
Issue #932 fixed
2019-05-31 17:52:52 +05:30
746d7e5204
Merge pull request #965 from rahulshukla-webkul/development
...
Development
2019-05-31 13:20:27 +05:30
12e93b3f58
cart updated for convert price
2019-05-31 12:48:04 +05:30
445b648b0a
Issues #948 , #949 fixed
2019-05-30 18:32:01 +05:30
49d8388d49
Merge pull request #962 from rahulshukla-webkul/development
...
UI fixes for project
2019-05-30 13:25:59 +05:30
3663391bf6
UI fixes for project
2019-05-30 11:52:06 +05:30
219b9fae03
Merge pull request #960 from rahulshukla-webkul/development
...
channel added for payment & shiping method's status
2019-05-29 14:29:32 +05:30
6804deae76
channel added for payment & shiping method's status
2019-05-29 13:31:53 +05: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
d1199a6f26
issue #956
2019-05-29 11:35:17 +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
b5eff8b47e
issue #942
2019-05-27 18:25:30 +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
d7c2ef3e6d
Merge pull request #944 from rahulshukla-webkul/development
...
Development
2019-05-24 17:18:17 +05:30
b8561d4d5e
schema condition in product flat table
2019-05-24 12:15:30 +05:30
308b3be1d8
installer file deletion after install
2019-05-24 11:53:11 +05:30
7efcdefc6a
changes in prouduct flat new migration
2019-05-23 18:49:29 +05:30
fb394d974c
Discount calculation added to the cart and discount added to the sales views
2019-05-23 18:44:16 +05:30
edec481f26
Sales discount calculation implemented
2019-05-23 17:00:11 +05:30
de5952bc36
issue #939
2019-05-23 13:06:31 +05:30
8678a865f0
column added in product flat table
2019-05-23 12:10:02 +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
5c6708c975
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-22 18:14:57 +05:30
f434024827
change datatype of post code
2019-05-22 17:03:48 +05:30
acfdd0f880
config field for password
2019-05-22 16:11:45 +05:30
698f7da6da
Merge pull request #930 from rahulshukla-webkul/development
...
issue #917 & #923
2019-05-22 12:10:32 +05:30
7888656d4c
down icon & product edit icon
2019-05-21 20:11:36 +05:30
30942b3d25
product page changes
2019-05-21 19:36:20 +05:30
84b60e9081
comment of phone field in customer
2019-05-21 18:07:54 +05:30
d965e10e4b
Merge pull request #931 from jitendra-webkul/jitendra
...
Api added for address delete
2019-05-21 13:04:37 +05:30
64fde804b4
Api added for address delete
2019-05-21 13:03:50 +05:30
568e6ff7c8
change for group
2019-05-21 12:46:43 +05:30
898214e81e
issue #925
2019-05-21 12:00:43 +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
4455ce6849
Merge pull request #912 from jitendra-webkul/jitendra
...
Refactored ProductController
2019-05-09 16:50:45 +05:30
165e6aef5b
Refactored ProductController
2019-05-09 16:49:52 +05:30
05d3870b06
Merge pull request #911 from jitendra-webkul/jitendra
...
Added url_key to product api
2019-05-09 13:25:50 +05:30
845a6c7f18
Added url_key to product api
2019-05-09 13:24:52 +05:30
6e3769a95e
Merge pull request #910 from rahulshukla-webkul/development
...
icon issue in layred navigation #issue 903
2019-05-09 12:32:55 +05:30
ce99a4d9bb
icon issue in layred navigation #issue 903
2019-05-09 12:28:48 +05:30
2a4e6a619b
Merge pull request #909 from jitendra-webkul/jitendra
...
Api add to cart error message issue fixed
2019-05-09 12:05:18 +05:30
a9a069f366
Api add to cart error message issue fixed
2019-05-09 12:04:41 +05:30
d31179edaa
removal of space
2019-05-09 11:38:34 +05:30
ae8a4dae61
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-09 11:36:51 +05:30
4c2a895b08
Issue #897 & change in valdation message for category image
2019-05-09 11:36:21 +05:30
55c083ae1e
Merge pull request #907 from jitendra-webkul/jitendra
...
Added api for forgot password
2019-05-08 18:57:25 +05:30
16220c656f
Added api for forgot password
2019-05-08 18:56:28 +05:30
3486983b1d
IE completed & redirect customer route
2019-05-08 17:52:54 +05:30
6f494cc04b
IE changes
2019-05-07 21:09:27 +05:30
e2120ea276
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-07 18:57:55 +05:30
b52dc978e8
Admin section for IE & dyanamic footer content
2019-05-07 18:57:33 +05:30
0ff492ae80
Fixed product repository search index issue
2019-05-07 17:54:43 +05:30
a72d054cb5
Added api for front shop
2019-05-07 17:06:21 +05:30
b4a95b8d0c
cart pages changes
2019-05-06 21:15:26 +05:30
1b3653348d
front end changes for IE
2019-05-06 20:52:43 +05:30
87b732898d
add & remove at cart page
2019-05-06 13:06:16 +05:30
af8705d8e8
Merge pull request #900 from shenjiayu/development
...
utilise Mail::queue to send emails
2019-05-02 16:52:54 +05:30
6b237b775d
Fixed payment class conflict
2019-05-02 11:00:02 +05:30
6121e5eefe
Added getPaymentMethods in Payment
2019-05-02 10:55:59 +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
db56e4b2df
issue #814
2019-04-30 17:53:59 +05:30
ca08b9a133
rtl css chages for category
2019-04-30 14:48:43 +05:30
46da666ace
issue #767
2019-04-30 13:25:17 +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
f841f16621
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-29 15:51:30 +05:30
cc3323c55d
issue #891 description issue
2019-04-29 15:51:15 +05:30
a57c3e0ba7
Merge pull request #892 from jitendra-webkul/jitendra
...
price issue fixed
2019-04-29 15:42:13 +05:30
5c68618416
price issue fixed
2019-04-29 15:41:31 +05:30
8d64ba656a
option attribute in layred navigation & category changes
2019-04-26 19:06:18 +05:30
2674fbb9ca
issue #850
2019-04-26 15:31:01 +05:30
23431e5083
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-26 12:44:38 +05:30
34aeeac2d0
Merge pull request #884 from jitendra-webkul/jitendra
...
Jitendra
2019-04-26 12:44:24 +05:30
10e92dada3
Now variant's super attributes values are saving in product_flat table
2019-04-26 12:43:42 +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
deb209d140
confirm box on delete
2019-04-25 13:05:35 +05:30
c09e000eb9
removal of view from customers service provider
2019-04-24 18:34:26 +05:30
85af8e8402
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-24 17:57:30 +05:30
75e74dfb7e
issue #867 shipment issue
2019-04-24 17:57:16 +05:30
c4c55bc48d
Refactored cart class
2019-04-24 17:09:46 +05:30
55e19c32c5
Merge pull request #873 from rahulshukla-webkul/development
...
issue #865 description
2019-04-24 16:26:37 +05:30
fb15e48c4d
issue #865 description
2019-04-24 16:14:35 +05:30
43a39dc77c
Merge pull request #872 from jitendra-webkul/jitendra
...
Fixed guard spell mistake
2019-04-24 16:06:19 +05:30
28fc43fbfa
Fixed guard spell mistake
2019-04-24 16:05:29 +05:30
723ecc88d9
Merge pull request #871 from jitendra-webkul/jitendra
...
Update Cart in order make compatible for api and session guard
2019-04-24 15:57:07 +05:30
ee056ee917
Update Cart in order make compatible for api and session guard
2019-04-24 15:55:49 +05:30
1f86376ffe
Merge pull request #870 from jitendra-webkul/jitendra
...
Configurable product add to cart issue fixed
2019-04-24 15:10:30 +05:30
ac03710f07
Configurable product add to cart issue fixed
2019-04-24 15:09:55 +05:30
8b0787ad53
issue #835
2019-04-24 14:45:57 +05:30
423d3d1bbf
issues
2019-04-24 10:48:12 +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
538c4beab0
merge with master
2019-04-23 15:40:06 +05:30
9903d23dfe
change in category menu
2019-04-23 15:38:11 +05:30
7a5c3f1bdc
Assets compiled for production
2019-04-23 12:58:47 +05:30
64ee90f372
Merge pull request #860 from jitendra-webkul/jitendra
...
Created new route for 404 page
2019-04-23 12:44:37 +05:30
b5c762b528
Created new route for 404 page
2019-04-23 12:43:42 +05:30
148ff7c1e8
merge with master
2019-04-23 12:36:05 +05:30
adfc375091
Merge pull request #859 from jitendra-webkul/jitendra
...
Issue #851 fixed
2019-04-23 11:17:25 +05:30
9d65030779
Issue #851 fixed
2019-04-23 11:16:34 +05:30
66b9cec73f
Merge pull request #858 from jitendra-webkul/jitendra
...
Issue #855 fixed
2019-04-23 11:03:48 +05:30
e18fd4e5c4
Issue #855 fixed
2019-04-23 11:03: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
600bf55f1f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-18 17:18:15 +05:30
d2868f6316
Merge pull request #849 from jitendra-webkul/jitendra
...
Fixed urldecode issue in search temm
2019-04-18 17:17:55 +05:30
f9e174ea70
Fixed urldecode issue in search temm
2019-04-18 17:16:36 +05:30
26bd9f4283
issue #845
2019-04-18 17:16:07 +05:30
7cd5bfe445
Merge pull request #847 from jitendra-webkul/jitendra
...
Issue #840 fixed
2019-04-18 15:51:53 +05:30
7e826bef00
Issue #840 fixed
2019-04-18 15:50:03 +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
439652699e
issue #836
2019-04-17 19:20:07 +05:30
13ac4a9571
issue #824
2019-04-17 15:21:48 +05:30
58ddc68520
issues
2019-04-17 12:56:33 +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
3e97bacf91
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 19:19:26 +05:30
095c045c58
change table of product datagrid to product_flat
2019-04-16 18:59:29 +05:30
7fc68c56ae
Added product id attribute to model
2019-04-16 16:37:52 +05:30
dd90e63ade
Fixed add to cart issue
2019-04-16 16:32:30 +05:30
1dd23a5a39
Changed varaible name productFlat to product in product card page
2019-04-16 16:02:04 +05:30
4e56374c70
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 16:01:37 +05:30
700a2951e6
added related products and up sells to the product view page
2019-04-16 15:57:38 +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
1aa9bf78aa
Removed unforced controller file from attribute package's Repositories directory
2019-04-16 14:41:12 +05:30
af88e8951a
Unnecessary Tax models removed from core, were originally moved from core to Tax module
2019-04-16 14:39:30 +05:30
ca7a5e4a6f
Changed the moduleServiceProvider registration back in concord config file.
2019-04-15 16:37:25 +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
f35e9a48d8
corrected composer.json provider path for UI package
2019-04-13 10:33:23 +05:30
520c21a4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-13 10:32:42 +05:30
44c898824e
removed duplicate entry in product linking
2019-04-12 18:43:42 +05:30
3fe8152758
added php tooltip.js dependency and laravel dusk for browser tests profiling
2019-04-12 18:20:33 +05:30
ee889cc259
upgrade code of zoom
2019-04-12 16:40:45 +05:30
1caa3eb4f6
image zoom in rtl
2019-04-12 14:11:05 +05:30
07b6ac6903
limit for up_sell, cross_sell & related product
2019-04-12 13:05:45 +05:30
f1c263805c
issues #815
2019-04-10 16:45:52 +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
ebc0befe6a
Merge pull request #813 from naresh-webkul/development
...
Development
2019-04-10 13:25:43 +05:30
d1e38fe83b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 12:12:15 +05:30
f3f61e3c91
Optimized performance
2019-04-10 12:10:46 +05:30
4f999ee34a
changed shipment table content
2019-04-09 19:40:43 +05:30
f2def6c4bc
scroller issue fixed
2019-04-09 19:28:44 +05:30
ab4c054292
changed shipment table
2019-04-09 18:52:44 +05:30
b6a1a05e66
added permission of add & delete in acl
2019-04-09 18:52:03 +05:30
Prashant Singh
jitendra
Jitendra Singh
rahul shukla
imanghafoori
shaiv-webkul
prateek srivastava
Jiayu Shen
shenjiayu
Prashant Singh
naresh verma