Commit Graph

58 Commits

Author SHA1 Message Date
devansh bawari 6b2897aec3 ID Added 2020-10-21 15:48:50 +05:30
devansh bawari d5df06e27b Unique Added 2020-10-21 15:26:24 +05:30
jitendra 77655fd95d Improved lighthouse score for default theme 2020-10-05 17:13:36 +05:30
Steffen Mahler 1b5c3bca93 resolve conflicts 2020-08-20 09:28:33 +02:00
Herbert Maschke 8614f74b4f Merge branch 'bagisto/master' into introduce-product-copy 2020-08-11 16:54:10 +02:00
rahulshukla-home bed01ea9c9 Issue #3638 fixed 2020-08-11 18:22:14 +05:30
Annika Wolff 58269996b2
Merge branch 'master' into check-if-item-in-cart-is-deactivated 2020-08-10 16:11:39 +02:00
Herbert Maschke 31a3ebb2b1 Merge branch 'bagisto/master' into introduce-product-copy 2020-08-10 12:17:28 +02:00
Herbert Maschke ca79b8b329 avoid 'Copy of Copy of Copy of ...' infinite prefixing of copies 2020-08-07 20:26:42 +02:00
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
Jitendra Singh e4931c9559
Merge pull request #3579 from devansh-webkul/coupon_code_issue
Fixed auto generated coupon codes are not getting applied #3556
2020-07-28 18:12:24 +05:30
Devansh 1febcf8843 Auto Generated Coupon Issue Fixed 2020-07-27 14:28:29 +05:30
Devansh e89c1cbd4a CartRule Issue Fixed 2020-07-25 13:08:48 +05:30
Steffen Mahler 2b4615b9c0 resolve conflict in CartRule.php 2020-07-15 08:44:56 +02:00
Florian Bosdorff 376ae65394 fix typo 2020-07-10 14:35:59 +02:00
Florian Bosdorff 43c4074bf7 improve performance when checking cart-rules 2020-07-10 08:18:42 +02:00
Steffen Mahler be931439aa fix issue in validateCartItem, refactoring of CartRule helper 2020-06-23 16:33:55 +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
Florian Bosdorff baa9e3f571 fix tiny issues due to code guidelines 2020-06-05 07:54:47 +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
Annika Wolff 4104a7b2ba Merge bagisto/master into cart-rule-validator-extension 2020-06-03 07:36:43 +02:00
Jitendra Singh 0b4b09b670
Merge pull request #3162 from bagisto/1.0
Added customer group price
2020-06-02 18:14:42 +05:30
Pranshu Tomar ae9ec7ce9b Added customer group price 2020-06-02 18:13:34 +05:30
Annika Wolff 566c65ef99 Merge 'master' into cart-rule-validator-extension 2020-05-28 13:36:13 +02:00
Annika Wolff f53a6fba16 extend cart rule validation with search in cart item additional 2020-05-28 13:14:58 +02:00
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +02:00
Steffen Mahler 15320934b4 fix issue with coupons with same code 2020-05-12 16:43:56 +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
Steffen Mahler d973ec94c0 add CartRuleCest 2020-04-28 18:15:40 +02:00
Jitendra Singh 955da20b45 Improved comments in code 2020-03-05 19:49:14 +05:30
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
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
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 fa6103df09 code style improvements 2020-02-26 18:31:49 +01:00
Herbert Maschke 13d73a3b1c Merge branch 'bagisto/master' into discount-issue 2020-02-26 16:43:33 +01:00
Herbert Maschke 6810339191 also fix discount apply WITH taxes (full amount) instead of BEFORE taxes 2020-02-26 16:41:59 +01:00
rahul shukla b0b4935006 time added in cart rules 2020-02-26 16:58:53 +05:30
Steffen Mahler d3c7682974 remove unnecessary line 2020-02-25 10:33:13 +01:00
Steffen Mahler c7cd5f5f51 remove line 2020-02-25 10:09:00 +01:00
SteffenMahler 24dd893de1
fix issue in coupon handling
I found a little issue on handling coupons in cart.

To reproduce this issue you have to do:
- create three simple products
- create a cart rule with coupon
- assign conditions, so that sku of product 1 and product 2 will match the coupon
- add product 1 to cart
- add product 2 to cart
- last add product 3 to cart (which has no coupon matching)
- apply the coupon

You get an error message.

So therefore I made some little changes.
2020-02-25 09:33:47 +01:00
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Herbert Maschke f7219767ed fix CartRuleRepository once more 2020-02-20 13:26:14 +01:00
Herbert Maschke 75d22eaf3a improve validation style of starts_from and ends_till in CartRuleRepository 2020-02-20 11:26:12 +01:00
rahul shukla e82fb888ab merge with master 2020-02-20 11:00:34 +05:30
rahul shukla 8835ab75dd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-20 10:59:29 +05:30