Commit Graph

150 Commits

Author SHA1 Message Date
Annika Wolff 76dbdb42dd fix adding multiple booking products to cart 2020-09-01 10:50:16 +02:00
Steffen Mahler 089f454f30 fix bug in cart item validation result 2020-08-21 10:49:01 +02:00
Steffen Mahler 1b5c3bca93 resolve conflicts 2020-08-20 09:28:33 +02:00
Annika Wolff 9190f2508e give the cartCest a meaning again 2020-08-18 10:26:06 +02:00
rahulshukla-home 76afd9329c Issue #3757 and CI check fail issue 2020-08-14 15:25:37 +05:30
Jitendra Singh 8514421cf0
Merge pull request #3682 from Haendlerbund/refactoring-cart-adding-tests
refactoring of cart.php, fix issue in booking product,
2020-08-12 21:42:06 +05:30
Jitendra Singh 56ab693f01
Merge pull request #3732 from rahulcs0082/development
Development
2020-08-12 15:05:07 +05:30
rahulshukla-home 1f3be04e46 Test cases failure fixed 2020-08-12 15:01:10 +05:30
Herbert Maschke 3e3681db5a add testBlockProductCopy 2020-08-11 09:31:11 +02:00
Herbert Maschke 3aeb0c75df ability to define if a product type can be copied in AbstractType.php 2020-08-10 17:24:36 +02:00
Herbert Maschke 6a248c6236 test and fix skipping of attributes and relations (product copy) 2020-08-10 09:51:15 +02:00
Herbert Maschke 3670a6210b introduce ability to make original and copy be linked to each other 2020-08-10 09:31:56 +02:00
Herbert Maschke 43f158d4c1 add a random suffix to url_key(slug) and name of copied product 2020-08-07 18:30:24 +02:00
Steffen Mahler 31ad898f52 fix issue in booking product, refactoring of cart.php, adding test for cart.php 2020-08-06 16:15:42 +02:00
Steffen Mahler c9f7c70d52 resolve conflicts 2020-08-06 15:23:32 +02:00
Herbert Maschke 0509f45762 introduce ability to copy an product 2020-07-30 14:15:54 +02:00
Jitendra Singh e6d11ed809
Merge pull request #3223 from Haendlerbund/admin-backend/keep-search-terms-after-new-page-load
Admin DataGrid: Keep search terms after page reload
2020-07-30 12:30:21 +05:30
ghermans f4b69964d2 Fixed leftover from #3595 2020-07-29 22:50:15 +02:00
Steffen Mahler ab4f3d62ac parenthesis incorrectly set 2020-07-06 12:54:24 +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 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 3ba83ace26 prevent flickering, use blisss theme 2020-06-11 14:23:34 +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
Florian Bosdorff 9219c283fb Merge branch 'bagisto/master' into haendlerbund/copy-cart-rules 2020-06-04 13:05:55 +02:00
Herbert Maschke 6ee005dda0 make a prefix to the copied cart rule ('copy of XXX') and properly save related channels and customer groups after replication 2020-06-03 09:24:40 +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
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
Annika Wolff a22c2e02be introduce cronjob to automatically deactivate expired events 2020-05-27 11:31:35 +02:00
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +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 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
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
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