Commit Graph

4027 Commits

Author SHA1 Message Date
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 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
Jitendra Singh 303b8765c2
Merge pull request #3173 from ilyasokay/language-development
Added Turkish Translation
2020-06-04 12:22:58 +05:30
Jitendra Singh e1332241b6
Merge pull request #3174 from jitendra-webkul/1.0
Issue #3113 fixed
2020-06-04 12:11:58 +05:30
Pranshu Tomar fb74d35ad5 Issue #3113 fixed 2020-06-04 12:11:06 +05:30
İlyas Okay bc5a906a00 Turkish Language added and English language duplicate rows deleted. 2020-06-03 18:22:47 +03:00
İlyas Okay ad9c85a0f5 Turkish Language added and English language duplicate rows deleted. 2020-06-03 18:11:28 +03:00
Jitendra Singh d75059254b
Merge pull request #3134 from Haendlerbund/cart-rule-validator-extension
Cart rule validator extension
2020-06-03 19:39:04 +05:30
Jitendra Singh 1e81e4b97d
Merge pull request #3165 from shubhwebkul/master
check if product_id exists
2020-06-03 19:31:28 +05:30
Jitendra Singh 9294eb81b3
Merge pull request #3167 from Haendlerbund/extend-editor-functionality
Extend CMS editor functionality
2020-06-03 19:29:30 +05:30
İlyas Okay 77e0610c89 Turkish Language added and English language duplicate rows deleted. 2020-06-03 16:22:23 +03:00
Pranshu Tomar 0de17f4711 Issue #3164 fixed 2020-06-03 13:25:02 +05:30
phillipmohr 9fbd436892 add table, lists, link and hr functionality to editor 2020-06-03 09:44:19 +02:00
Shubham Mehrotra c8e987f1e9 check if product_id exists 2020-06-03 12:14:24 +05:30
Annika Wolff 51851a077a fix compatibility issue to AbstractType 2020-06-03 07:37:26 +02:00
Annika Wolff 4104a7b2ba Merge bagisto/master into cart-rule-validator-extension 2020-06-03 07:36:43 +02:00
Annika Wolff b8a6619c81 Merge 'cart-rule-validator-extension' of bagisto into cart-rule-validator-extension 2020-06-03 07:16:39 +02:00
Annika Wolff ca6933d3a8 add english translation to foreign languages 2020-06-03 07:15:56 +02:00
Annika Wolff f99ecf6086
Refactor some changes
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
2020-06-03 07:12:22 +02:00
Jitendra Singh bac17a08fb
Merge pull request #3163 from jitendra-webkul/1.0
Fixed bundle type class compatablity issue
2020-06-02 18:53:54 +05:30
Pranshu Tomar 8e64676197 Fixed bundle type class compatablity issue 2020-06-02 18:49:20 +05:30
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
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
Annika Wolff 2748ba84ce add additional to all languages 2020-05-28 13:39:41 +02:00
Annika Wolff 566c65ef99 Merge 'master' into cart-rule-validator-extension 2020-05-28 13:36:13 +02:00
Annika Wolff 5f10981136 Merge 'master' of https://github.com/Haendlerbund/bagisto 2020-05-28 13:25:47 +02:00
Annika Wolff f53a6fba16 extend cart rule validation with search in cart item additional 2020-05-28 13:14:58 +02:00
Shubham Mehrotra e77618f469 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-05-28 15:58:48 +05:30
Shubham Mehrotra 1dace6e5cf remove irrelevant code 2020-05-28 15:58:31 +05:30
Jitendra Singh 05a1e0eb13
Merge pull request #3125 from kmso-de/bugfix/menu-icons-mobile
overlapping logo with menu icons (click action)
2020-05-28 15:09:35 +05:30
rahulshukla-home e52cba981f Issue #3021 2020-05-27 22:09:17 +05:30
Jan Bickel b6048ea60a overlapping logo with menu icons (click action), built assets 2020-05-27 18:04:38 +02:00
rahulshukla-home b8417ff7d3 Issue #2804 2020-05-27 19:07:30 +05:30
rahulshukla-home 9963c87bd1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-27 18:37:06 +05:30
rahulshukla-home 2c002a0f8a Issue #2729 2020-05-27 18:36:52 +05:30
Jan Bickel 3fad14a569 overlapping logo with menu icons (click action) 2020-05-27 13:11:13 +02:00
Jitendra Singh b254736bd5
Merge pull request #3123 from shubhwebkul/master
Issue #1522 resolved
2020-05-27 16:23:20 +05:30
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
Jitendra Singh 8e3be0c692 Merge pull request #3109 from Haendlerbund/add-field-company-name-to-views
add field company_name to views
2020-05-27 15:04:18 +05:30
Shubham Mehrotra 9eb14326c4 #1522 2020-05-27 13:03:10 +05:30
Jitendra Singh c5cb04febf
Merge pull request #3112 from rahulcs0082/development
Development
2020-05-27 10:31:26 +05:30
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +02:00
Herbert Maschke 11fb120b51 adjust cart rule filter position a few pixels to align it as it is in products/index.blade.php 2020-05-25 08:31:12 +02:00
Annika Wolff 8a51417425 revert changes 2020-05-22 12:12:40 +02:00
Annika Wolff 5363b5645f revert changes 2020-05-22 12:09:19 +02:00