Commit Graph

66 Commits

Author SHA1 Message Date
Annika Wolff 752ff116bd
bagisto master backmerge (#26)
* introduce cronjob to automatically deactivate expired events

* remove irrelevant code

* extend cart rule validation with search in cart item additional

* add additional to all languages

* add ValidatorCest

* add ValidatorCest

* Fixed case sensitivity typo in Bundle class

* Update 503.blade.php

* Added customer group price

* Fixed bundle type class compatablity issue

* Refactor some changes

Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>

* add english translation to foreign languages

* fix compatibility issue to AbstractType

* check if product_id exists

* make a prefix to the copied cart rule ('copy of XXX') and properly save related channels and customer groups after replication

* add table, lists, link and hr functionality to editor

* Issue #3164 fixed

* Turkish Language added and English language duplicate rows deleted.

* Turkish Language added and English language duplicate rows deleted.

* Turkish Language added and English language duplicate rows deleted.

* Issue #3113 fixed

* fix tiny issues due to code guidelines

* add default value for search term

* fix typo

* Fixed typo in customer group price migration

* Issue #3171 fixed

* Issue #3070 fixed

* minified jquery-ez-plus file

* Issue #3160 fixed

Co-authored-by: Shubham Mehrotra <shubh0896m@gmail.com>
Co-authored-by: Matt April <matthew.japril@gmail.com>
Co-authored-by: bhumikaisarani <63963172+bhumikaisarani@users.noreply.github.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
Co-authored-by: Herbert Maschke <thyseus@pm.me>
Co-authored-by: phillipmohr <phillip.mohr@sellerboost.de>
Co-authored-by: İlyas Okay <ilyasokay@hotmail.com>
Co-authored-by: Florian Bosdorff <florian.bosdorff@haendlerbund.de>
Co-authored-by: phillipcodes <57101430+phillipcodes@users.noreply.github.com>
2020-06-09 07:55:56 +02:00
Jitendra Singh 23fd60cf2b
Merge pull request #3121 from Haendlerbund/copy-cart-rules
introduce the ability to copy a cart rule
2020-05-27 16:22:54 +05:30
Jitendra Singh 21eb34c64b
Merge pull request #3027 from Haendlerbund/bugfix-save-booking-products
#3026 fixed
2020-05-27 16:21:41 +05:30
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +02:00
Florian Bosdorff 6a8db1ea9b fix CustomerCest 2020-05-09 12:46:11 +02:00
Florian Bosdorff 33ddae27ae fix namespace issues 2020-05-09 12:38:20 +02:00
Annika Wolff dd15b0a3a0 restart flickering test 2020-05-08 13:41:13 +02:00
Jitendra Singh 0aaa1fd030
Merge pull request #2983 from Haendlerbund/fix-randomly-failing-tax-cest
Fix randomly failing TaxCest and CartTaxesCest
2020-05-01 16:05:48 +05:30
Steffen Mahler 95f190375e set price faker in Laravel5Helper to 2 decimals, fix rounding in CartTaxesCest too 2020-05-01 11:18:56 +02:00
Steffen Mahler ad4e517291 remove newline 2020-05-01 10:13:38 +02:00
Steffen Mahler 1caa039fcd fix GuestCheckoutCest 2020-05-01 10:02:27 +02:00
Florian Bosdorff 01d4cb026f fix address_type at many places; add tests for address relations 2020-04-17 11:09:59 +02:00
Herbert Maschke 00e351ce30 adjust code generation to how it should be in AttributeFamilyCest.php 2020-03-10 10:55:30 +01:00
Herbert Maschke 7e6de00e0e generate uuid instead of word in AttributeFamilyCest.php to avoid randomly failing test 2020-03-10 10:24: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
Herbert Maschke fd6601ecdf three more assertions about customer 2020-03-03 11:22:34 +01:00
Herbert Maschke e094dfd09c add additional assertions to OrderCest.php 2020-03-03 11:18:18 +01:00
Herbert Maschke d3d666d230 use faker to generate random data in OrderCest.php 2020-03-03 10:55:37 +01:00
Herbert Maschke b6f81af54e DRY OrderCest.php a little bit 2020-03-03 10:53:14 +01:00
Herbert Maschke 895978e600 finish testCheckoutAsCustomer 2020-03-02 09:08:51 +01:00
Herbert Maschke 3e9c68f01d introduce prepareCart() to be able to do checkout tests [wip] [ci-skip] 2020-02-28 11:41:48 +01:00
Jitendra Singh 24e69e2cd9
Merge pull request #2247 from Haendlerbund/fix-tax-handling
Fix tax handling
2020-02-21 15:20:35 +05:30
Annika Wolff 154a933dc6
Merge branch 'master' into fix-tax-handling 2020-02-20 17:19:28 +01:00
Herbert Maschke 8b5def9756 introduce CartRuleCest.php 2020-02-20 11:56:07 +01:00
rahul shukla 4e3fef5b04 Test case for customer create 2020-02-14 18:02:19 +05:30
MonaHartdegen 7a69e4368e modified functional GuestCheckoutCest 2020-02-12 10:33:17 +01:00
Steffen Mahler 7dff220da9 fix issue with zip based taxes, added functional test 2020-02-08 20:42:32 +01:00
Steffen Mahler b94fc9fc8c merge master and resolve conflicts 2020-02-07 10:44:04 +01:00
MonaHartdegen 6c40b5db3a fixed test CustomerCest 2020-02-05 13:50:29 +01:00
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 ec89d97816 refactoring 2020-02-04 17:41:05 +01:00
Steffen Mahler 01010db842 set default_country to null, add fallback for test 2020-02-04 14:38:52 +01:00
Steffen Mahler a61446f1aa refactoring 2020-02-04 14:31:18 +01:00
Annika Wolff 53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-02-04 14:08:46 +01:00
Steffen Mahler 7c661efd88 add unit tests, refactoring 2020-02-04 11:18:40 +01:00
Steffen Mahler cb5e3a47f6 fix tax handling, add functional cest for cart 2020-02-04 08:50:37 +01:00
Jitendra Singh 453908a768
Merge pull request #2214 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
add ability to provide company_name in address during checkout
2020-02-04 11:40:39 +05:30
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Herbert Maschke 178f89165e add required validations 2020-01-31 06:06:13 +01:00
Annika Wolff ee1f9bb57c refactor functional AttributeCest, that was flickering sometimes 2020-01-30 15:47:22 +01:00
Steffen Mahler 574b2820c4 fix simple product in cartcest 2020-01-28 16:32:55 +01:00
Steffen Mahler d3e00d4543 add functional test for cart, fix tests with usage of 2020-01-28 16:28:29 +01:00
Steffen Mahler 0d696c6b1a merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring 2020-01-28 15:51:50 +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
Herbert Maschke 8a927d32c1 repair italian factory 2020-01-24 15:26:33 +01:00
Herbert Maschke 80dc92efa4 remove redundant factory registration 2020-01-24 15:21:27 +01:00