Commit Graph

51 Commits

Author SHA1 Message Date
Steffen Mahler a44fa7445d refactoring of validateCartItem methods of product types 2020-07-04 15:20:59 +02:00
Steffen Mahler 3de5601df0 merge bagisto master, resolve conflicts 2020-06-17 08:29:55 +02:00
Steffen Mahler 967b0903e5 merge master, resolve comnflicts 2020-06-17 08:12:10 +02:00
Annika Wolff e88d92ed1a add tests 2020-06-09 14:29:27 +02:00
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 473acae380
Merge pull request #3124 from Haendlerbund/cronjob-deactivating-booking-events
Automatically deactivate expired event products
2020-06-08 12:11:37 +05:30
Steffen Mahler 86dadf400d merge branch 'bagisto/master' into check-if-item-in-cart-is-deactivated 2020-06-04 13:36:56 +02:00
Steffen Mahler 643264ca90 fix CartControllerCest 2020-06-04 13:25:12 +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 80bd331123 add function to remove inactive products from cart 2020-05-29 13:28:54 +02:00
Annika Wolff 4f7378a88d add ValidatorCest 2020-05-28 14:17:36 +02:00
Annika Wolff 021e9b59ca add ValidatorCest 2020-05-28 14:17:28 +02:00
Annika Wolff a22c2e02be introduce cronjob to automatically deactivate expired events 2020-05-27 11:31:35 +02:00
Jitendra Singh 4af22ad5df
Merge pull request #3034 from Haendlerbund/fix-namespace-issues
fix namespace issues
2020-05-13 12:53:21 +05:30
Florian Bosdorff 33ddae27ae fix namespace issues 2020-05-09 12:38:20 +02:00
Steffen Mahler 3f160c8fe6 remove constant value 2020-05-05 15:59:13 +02:00
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
Jitendra Singh 7f3e564c14
Merge pull request #2966 from Haendlerbund/add_tests_for_cart_rules
Add tests for cart rules
2020-05-01 18:11:03 +05:30
Jitendra Singh 7639dfbf51
Merge pull request #2962 from Haendlerbund/channel-filter-for-cart-rule-grid
introduce channel and customer group filter for cart rule grid
2020-05-01 18:09:48 +05:30
Steffen Mahler 3d2e49ae7a remove unnecessary use statements 2020-05-01 09:29:56 +02:00
Steffen Mahler bf2c109a7b merge bagisto master 2020-05-01 09:14:33 +02:00
Steffen Mahler 68a1d16e92 fix randomly failing tax cest 2020-05-01 09:09:57 +02:00
SteffenMahler ede46da84b
Merge branch 'master' into add_tests_for_cart_rules 2020-04-29 10:31:06 +02:00
Steffen Mahler cbd873b106 fix calulation helper in test 2020-04-29 09:27:19 +02:00
Herbert Maschke 3154d27f52 introduce channel and customer group filter for cart rule grid 2020-04-29 09:19:47 +02:00
Steffen Mahler d973ec94c0 add CartRuleCest 2020-04-28 18:15:40 +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
Steffen Mahler dbb17a93e3 fix rounding in taxcest 2020-03-30 19:35:56 +02:00
Steffen Mahler c13ae36494 fix tax rate rounding 2020-03-30 19:30:10 +02:00
Steffen Mahler ae467fc182 merge master, refactoring tests 2020-02-04 18:13:09 +01:00
Steffen Mahler ec89d97816 refactoring 2020-02-04 17:41:05 +01:00
Steffen Mahler cdd61fa77e fix test for misconfigured config/app.php 2020-02-04 17:21:18 +01:00
Steffen Mahler a61446f1aa refactoring 2020-02-04 14:31:18 +01:00
Steffen Mahler 721091cf32 unit test 2020-02-04 13:27:47 +01:00
Steffen Mahler 7c661efd88 add unit tests, refactoring 2020-02-04 11:18:40 +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 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
peternuernberger 90a182ec94 fixed getRootCategory 2020-01-06 16:52:48 +01:00
peternuernberger 6f4b7474cb Merge remote-tracking branch 'bagisto-hb/category-url-structure-multiple-roots' into 18472-bugfix/add-category-url-path 2020-01-06 16:28:00 +01:00
peternuernberger fcb5cdec46 multiple root categories fix 2020-01-06 16:26:20 +01:00
MonaHartdegen c065631a58 set correct category url_path in multiple root categories environment 2020-01-06 15:37:55 +01:00
MonaHartdegen f4499b4728 altered trigger to be compatible with multi root categories environment; tests still WIP 2020-01-03 15:22:09 +01:00
peternuernberger c351492212 added amGoingTo to test 2019-12-30 13:27:41 +01:00
peternuernberger e8f3b1009c added some test context 2019-12-30 13:17:34 +01:00
peternuernberger a2f2c650a4 added method that returns path categories 2019-12-23 17:13:48 +01:00
Jitendra Singh 068b688e7c
Merge pull request #1785 from Haendlerbund/1244-url-structure-for-products-and-categories
1244 url structure for products and categories (SEO improvements)
2019-12-18 12:38:53 +05:30
David Große b679f543db move tests/OrderRepositoryCest.php into brand new shiny fancy codeception tests/ folder 2019-12-13 14:10:44 +01:00
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00