Commit Graph

325 Commits

Author SHA1 Message Date
Steffen Mahler c9f7c70d52 resolve conflicts 2020-08-06 15:23:32 +02:00
Carlos Augusto Gartner ba54e98a3e Created and updated the composer files of the packages 2020-08-05 09:40:59 -03:00
Steffen Mahler a06bca38d4 fix bug, add type hints, fix annotations 2020-07-27 08:06:03 +02:00
Devansh 83c5b6b963 Shipping Charges Issue Fixed 2020-07-23 20:42:11 +05:30
Steffen Mahler 048d803d4d cart is dirty even if an item is inactive and will be removed 2020-07-07 10:47:41 +02:00
Steffen Mahler 6d893dd6e0 round items tax value instead or truncate by database field 2020-07-06 13:58:11 +02:00
Steffen Mahler 56ea5c0a52 fix failing tests 2020-07-06 08:56:04 +02:00
Steffen Mahler a44fa7445d refactoring of validateCartItem methods of product types 2020-07-04 15:20:59 +02:00
Steffen Mahler be931439aa fix issue in validateCartItem, refactoring of CartRule helper 2020-06-23 16:33:55 +02:00
Steffen Mahler 3de5601df0 merge bagisto master, resolve conflicts 2020-06-17 08:29:55 +02:00
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