Jitendra Singh
3b2df1f99c
Merge pull request #3193 from Haendlerbund/add-context-to-logging-when-adding-product-to-cart
...
Add logging to exception thrown in cart
2020-06-16 13:54:52 +05:30
Annika Wolff
a196b7ac02
extend order item and cart item factories
2020-06-11 10:51:40 +02:00
Steffen Mahler
e630bef3d7
add newlines
2020-06-11 08:21:45 +02:00
Annika Wolff
dbc16cf7e6
add logging of catched exception
2020-06-09 10:14:06 +02:00
Annika Wolff
a32925f6ce
refactor used translation function
2020-06-09 08:35:22 +02:00
Annika Wolff
449a2e1d47
add logging to exception thrown in cart
2020-06-09 08:15:17 +02:00
Steffen Mahler
a735180f38
refactoring, add language keys
2020-06-05 08:19:13 +02:00
Steffen Mahler
dcc6ae3f94
store in session removed
2020-06-04 13:56:00 +02:00
Steffen Mahler
1825ac9d76
improve type hints and annotations
2020-06-04 13:16:31 +02:00
Steffen Mahler
6dccb1330e
store updated cart in session
2020-06-04 13:12:48 +02:00
Steffen Mahler
177327a7d2
rework removing of inactive products from cart, add error handling and messaging
2020-06-04 13:09:00 +02:00
Steffen Mahler
4714e6d89f
add type hint
2020-05-29 13:46:20 +02:00
Steffen Mahler
80bd331123
add function to remove inactive products from cart
2020-05-29 13:28:54 +02:00
Jitendra Singh
3e894fc3da
Merge pull request #2999 from MattApril/fix_broken_state_taxes
...
Fixed undefined $state variable when using State based tax rates.
2020-05-18 20:56:50 +05:30
Jitendra Singh
5630e0ee5d
Merge pull request #3003 from Haendlerbund/fix-bugs-extend-test
...
various fixes for cart rules and taxes
2020-05-13 12:52:41 +05:30
rahulshukla-home
83cb0ff3d8
Issue #2987
2020-05-06 11:39:45 +05:30
rahulshukla-home
af3b152681
Issue #2987
2020-05-06 11:36:07 +05:30
Steffen Mahler
de1f75df12
fix discount calulation for percentage coupon, various bug fixes in tax rounding, add test
2020-05-05 15:46:02 +02:00
Matt April
f32d6edff7
Fixed undefined $state variable when using State based tax rates.
2020-05-04 18:37:23 -04:00
Steffen Mahler
214d7a8161
merge branch 'add_tests_for_cart_rules' of https://github.com/Haendlerbund/bagisto into add_tests_for_cart_rules
2020-04-29 10:42:31 +02:00
Steffen Mahler
5d43e2b8bb
type hint changed
2020-04-29 10:40:41 +02:00
SteffenMahler
ede46da84b
Merge branch 'master' into add_tests_for_cart_rules
2020-04-29 10:31:06 +02:00
Steffen Mahler
d973ec94c0
add CartRuleCest
2020-04-28 18:15:40 +02:00
Jitendra Singh
a8c969d019
Merge pull request #2958 from jitendra-webkul/1.0
...
Issue #2954 fixed
2020-04-28 20:03:36 +05:30
Pranshu Tomar
1a716047ac
Issue #2954 fixed
2020-04-28 19:57:30 +05:30
Pranshu Tomar
559954e88d
Issue #2954 fixed
2020-04-28 19:22:30 +05:30
Florian Bosdorff
754c52e556
rename address types
2020-04-20 08:22:31 +02:00
Florian Bosdorff
910f76952f
fix address-constrains; fix address global scopes
2020-04-17 15:54:02 +02:00
Florian Bosdorff
01d4cb026f
fix address_type at many places; add tests for address relations
2020-04-17 11:09:59 +02:00
Florian Bosdorff
5a9dfd8561
add unified address-table and handling for models
2020-04-16 21:13:19 +02:00
Pranshu Tomar
6d5cc8a456
Issue #2722 fixed
2020-03-23 22:53:23 +05:30
Jitendra Singh
28f1ab7afe
Merged with master
2020-03-19 19:18:59 +05:30
SteffenMahler
14efa58c0a
tiny fixes, add before event
2020-03-19 12:02:11 +01:00
SteffenMahler
62eaad1091
update Cart.php
...
Dispatch an event after function calculateItemsTax() is finished
2020-03-19 10:38:47 +01:00
Jitendra Singh
663a679a5d
Merge pull request #2588 from Haendlerbund/order-workflow-improvements
...
Order workflow improvements and tests
2020-03-18 14:50:48 +05:30
Jitendra Singh
17abfdb1d6
Issue #2677 fixed
2020-03-18 13:24:12 +05:30
Jitendra Singh
d76a8d8dec
Issue #2669 fixed
2020-03-17 15:34:33 +05:30
Jitendra Singh
bf5ad13dac
Issue #2672 fixed
2020-03-17 12:25:04 +05:30
Herbert Maschke
7a3a1726bc
Merge branch 'bagisto/master' into order-workflow-improvements
2020-03-06 15:50:26 +01:00
Herbert Maschke
e40d3ec619
fill in correct address attributes
2020-03-05 16:16:17 +01:00
Herbert Maschke
7c634046db
add ?? operator in case address data fails
2020-03-05 16:00:21 +01:00
Herbert Maschke
19ebc48fbc
further refactoring of Cart Component
2020-03-05 15:52:20 +01:00
Jitendra Singh
10db1838f2
Removed author information from every class
2020-03-05 19:28:42 +05:30
Jitendra Singh
92261d4214
Improved comments in code
2020-03-05 19:07:08 +05:30
Jitendra Singh
a6ce67151f
Improved comments in code
2020-03-05 11:04:57 +05:30
Herbert Maschke
d9072508cd
introduce a fallback in case the customer profile is not filled completely. Take the billing address information then.
2020-03-04 10:38:29 +01:00
Jitendra Singh
41e06d5dc5
Improved code style
2020-03-04 12:02:53 +05:30
Herbert Maschke
895978e600
finish testCheckoutAsCustomer
2020-03-02 09:08:51 +01:00
Jitendra Singh
05be7a070a
Improved code style
2020-02-27 13:33:03 +05:30
Jitendra Singh
0f42e8ff8f
Resolved conflicts
2020-02-27 12:07:20 +05:30
Herbert Maschke
427ba43743
grand total of cart discount apply calculation issue
2020-02-26 15:58:54 +01:00
Jitendra Singh
91064cd0bc
Quantity availability check implemented for default booking
2020-02-26 13:11:24 +05:30
Herbert Maschke
95dfe3f8d0
propagate the company_name and vat_id from address through cart to order addresses
2020-02-26 07:37:17 +01:00
Jitendra Singh
95d198c1d6
Fixed merge cart issue for booking product
2020-02-24 16:40:44 +05:30
Jitendra Singh
5c696f8d00
Resolved conflicts
2020-02-21 19:36:17 +05:30
Annika Wolff
d50510a626
resolve merge issue, add type hints in Cart helper function
2020-02-21 08:36:52 +01:00
Annika Wolff
623b7893a2
resolve merge conflicts
2020-02-20 19:23:01 +01:00
Annika Wolff
154a933dc6
Merge branch 'master' into fix-tax-handling
2020-02-20 17:19:28 +01:00
Jitendra Singh
973d8ebc60
Improved checkout package code style
2020-02-19 17:44:07 +05:30
rahul shukla
d62b61b19c
Issue #2463
2020-02-19 16:12:54 +05:30
rahul shukla
486520d3ac
helper updated
2020-02-18 15:17:07 +05:30
rahul shukla
3c94cdf100
Issue #2463
2020-02-17 17:59:15 +05:30
Jitendra Singh
5ec6559a07
Issue #2395 fixed
2020-02-11 13:10:14 +05:30
Steffen Mahler
7dff220da9
fix issue with zip based taxes, added functional test
2020-02-08 20:42:32 +01:00
Steffen Mahler
00c43e21de
cleanup
2020-02-07 19:23:15 +01:00
Steffen Mahler
1d08f8a1f5
extend API endpoint for Cart by taxes
2020-02-07 19:09:41 +01:00
Steffen Mahler
b94fc9fc8c
merge master and resolve conflicts
2020-02-07 10:44:04 +01:00
Jitendra Singh
e06a35b282
Move to wishlist issues fixed if product is already in wishlist
2020-02-06 17:49:23 +05:30
Steffen Mahler
e678a467fc
call collectTotals in saveCustomerAddress
2020-02-05 11:18:21 +01:00
Steffen Mahler
ae467fc182
merge master, refactoring tests
2020-02-04 18:13:09 +01:00
Steffen Mahler
0d6aee18e4
merge remote-tracking branch 'bagisto/master' into fix-tax-handling
2020-02-04 17:55:53 +01:00
Steffen Mahler
dd8f653df4
minor improvements
2020-02-04 14:48:15 +01:00
Steffen Mahler
a61446f1aa
refactoring
2020-02-04 14:31:18 +01:00
Steffen Mahler
cb5e3a47f6
fix tax handling, add functional cest for cart
2020-02-04 08:50:37 +01:00
Steffen Mahler
8abce3302a
tax helper introduced, views changed to display multiple tax rates
2020-01-31 16:08:01 +01:00
Annika Wolff
e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring
2020-01-31 09:41:58 +01:00
Herbert Maschke
4d28188efb
move factories into appropriate packages and remove redundant ones
2020-01-31 05:42:13 +01:00
Steffen Mahler
d722ba8665
change annotation comment
2020-01-29 11:43:19 +01:00
Steffen Mahler
14c0276fce
update cart button is not shown, when only products without quantity box are in cart, tests added
2020-01-28 15:38:07 +01:00
Steffen Mahler
a5c49e4b76
button 'update cart' will only be shown if corresponding products are in cart
2020-01-24 07:15:49 +01:00
rahul shukla
8548884d3e
removed dd
2020-01-23 19:49:41 +05:30
rahul shukla
259f5a8c00
Issue #2088
2020-01-23 19:43:03 +05:30
Florian Bosdorff
61d9b59e5f
Merge master into issue-1183/guest-checkout-configuration
2020-01-22 08:10:45 +01:00
Jitendra Singh
a606c06e11
Cart rule and catalog rule updated for laravel 6.0
2020-01-21 15:51:12 +05:30
rahul shukla
e3db0b164c
conflict resolve
2020-01-21 13:24:19 +05:30
Annika Wolff
132dd6c0f0
introduce guest checkout configuration
2020-01-17 14:42:47 +01:00
Annika Wolff
91d6586ad8
resolve exception, rename function haveDownloadableItems
2020-01-15 11:53:48 +01:00
Annika Wolff
a75f3dab51
resolve conflicts
2020-01-15 11:37:38 +01:00
Jitendra Singh
6ed1410821
Merge pull request #2019 from jitendra-webkul/1.0
...
Issue #1979 fixed
2020-01-09 17:14:16 +05:30
Jitendra Singh
14869df230
Issue #1979 fixexd
2020-01-09 17:03:58 +05:30
rahul shukla
830367ef93
loop issue in tax calculate, #1994
2020-01-09 12:48:59 +05:30
Jitendra Singh
ca0f8bca49
Issues #1997 , #1994 fixed
2020-01-08 17:01:50 +05:30
rahul shukla
4b2088e66e
upgrade to laravel 6
2019-12-30 17:10:38 +05:30
Annika Wolff
d47201af75
bugfixed quantity update when showQuantityBox is false
2019-12-27 14:41:32 +01:00
Annika Wolff
9fd5ff7f47
small refactor on checks if downloadable product
2019-12-27 10:03:01 +01:00
rahul shukla
23a15be1e0
compatible with laravel 5.8
2019-12-24 19:31:13 +05:30
jitendra
795561ea58
Made all changes for discount packages
2019-12-21 16:00:22 +05:30
jitendra
2d0b26d78a
Added changes on core packages for discount
2019-12-21 13:01:16 +05:30
jitendra
2380c1b597
Merged with master
2019-12-21 10:58:46 +05:30
jitendra
513b07e4cf
Added new cart rule and catalog rule
2019-12-21 10:55:32 +05:30
Herbert
4261590102
add resources/manifest.php skeletons for Webkul packages
2019-11-13 12:02:56 +01:00
Jitendra Singh
ede889703e
Merge pull request #1737 from jitendra-webkul/jitendra
...
Issue #1347 fixed
2019-11-05 12:45:22 +05:30
jitendra
8347e1770b
Issue #1347 fixed
2019-11-05 12:44:26 +05:30
Jitendra Singh
a9ce5bea76
Merge pull request #1726 from prashant-webkul/bugs_patch_1
...
Fixed issue #1543 and Cart rule related issues
2019-11-01 15:42:55 +05:30
Prashant Singh
832c845091
Fixed issue #1543 and Cart rule related issues
2019-11-01 15:40:11 +05:30
jitendra
973332f6c0
Issue #1724 fixed
2019-11-01 11:03:40 +05:30
jitendra
ab2d069ec7
Issue #1519 fixed
2019-10-31 17:07:49 +05:30
jitendra
62533d9df8
postcode column changed to varchar from int
2019-10-24 17:38:08 +05:30
jitendra
dfb9c75e77
Move wishlist to cart issue fixed
2019-10-24 17:08:41 +05:30
jitendra
5f0b26f038
Bundle product add to cart issue fixed
2019-10-24 16:29:09 +05:30
Prashant Singh
23237f9921
Made Catalog Rules made compatible with new product types and updated issue templates
2019-10-23 19:00:22 +05:30
jitendra
0864dd5d1a
Issue #1592 fixed
2019-10-11 12:11:07 +05:30
jitendra
210a19757f
Issue #1574 fixed
2019-10-10 17:41:30 +05:30
jitendra
6384b84746
Resolve conflicts
2019-09-11 13:16:37 +05:30
jitendra
e250bc0602
Tax not getting applied if only order is placed for virtual product and downloadable product or for both.
2019-09-11 12:31:25 +05:30
jitendra
1ce4dfea95
Merge cart issue fixed for downloadable product
2019-09-11 11:21:12 +05:30
Matt April
a8141c3fb3
Change 'self' references inside models to 'static'. This fixes issues when models are overriden, but he base class continues to references itself rather than the new model.
2019-09-07 20:14:27 -04:00
jitendra
eafa585cb8
Order creation completed for bundle product
2019-09-03 15:46:13 +05:30
jitendra
557cbb1db1
Bundle add to cart added
2019-08-30 17:09:15 +05:30
Prashant Singh
1e0da3c42a
Fixed issue #778
2019-08-29 16:11:12 +05:30
jitendra
ec567d624f
Db schema, models and repositories added for bundle type product
2019-08-20 17:57:39 +05:30
jitendra
e2bd18e916
Resolved conflicts
2019-08-19 16:01:38 +05:30
jitendra
29e4851bfb
Group product added
2019-08-19 15:00:24 +05:30
rahul shukla
561803cd3c
filterable attribute for category, tax price update on cart and issue #1234
2019-07-31 17:44:29 +05:30
jitendra
f529a128cd
Removed unnecessary code from sevice providers
2019-07-01 20:03:16 +05:30
jitendra
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
Prashant Singh
be2b55a898
fixed event fire on movetocart from wishlist
2019-06-29 18:44:23 +05:30
jitendra
f08a8036e6
Resolved conflict
2019-06-29 17:57:10 +05:30
Prashant Singh
e3bc993c99
Added cart item add before event
2019-06-29 17:24:41 +05:30
Prashant Singh
ec2baa1be9
bug fix for event fire
2019-06-29 17:07:19 +05:30
Prashant Singh
ff863fcc54
Added cart item add after event for move to cart from wishlist
2019-06-29 17:04:18 +05:30
jitendra
ad6e422fdb
Added downloadable and virtual products
2019-06-29 15:23:34 +05:30
jitendra
55b71e1e66
updated
2019-06-28 19:48:52 +05:30
Prashant Singh
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
Jitendra Singh
0102dd0c30
Merge pull request #1111 from prashant-webkul/development
...
Development
2019-06-27 11:45:23 +05:30
Prashant Singh
3e4d2603c4
Apply to shipping and free shipping now enabled and provided support for multi currency cart rule discount
2019-06-27 04:35:26 +05:30
rahul shukla
54fa3419f3
admin name for attribute
2019-06-26 21:03:52 +05:30
rahul shukla
f72529f0fb
issue of discount amount in order #1053
2019-06-20 12:17:11 +05:30
Prashant Singh
ea185aad7b
Discount package bug fixes and complete refactor with overriding features for actions
2019-06-17 08:56:30 +05:30
Prashant Singh
8d68be8e07
Rule condition discount calculation now working properly
2019-06-15 12:27:54 +05:30
Prashant Singh
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +05:30
Prashant Singh
da82f2935c
removed some dead code
2019-06-14 17:55:03 +05:30
Prashant Singh
4bfefd3a07
base sync
2019-06-14 13:22:37 +05:30
Prashant Singh
c52238e45e
Cart rule frontend normalization
2019-06-14 13:21:17 +05:30
Prashant Singh
7f9409bd8e
Checkout and cart page now coupled with cart rules
2019-06-14 12:10:03 +05:30
Prashant Singh
e9a0588185
discount rule fixes
2019-06-13 22:19:44 +05:30
jitendra
806f8f71f6
Added discount amount to cart item
2019-06-13 19:34:13 +05:30
Prashant Singh
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
jitendra
c6a44b5414
Updated cart for custom_price
2019-06-07 11:18:46 +05:30
rahul shukla
dc96dfb7b2
custom price default to null
2019-06-07 11:12:40 +05:30