Commit Graph

5444 Commits

Author SHA1 Message Date
Florian Bosdorff 98111f686c add ability to customize order incrment number generator 2020-06-30 09:46:48 +02:00
Florian Bosdorff f17a3910f0 Merge branch 'bagisto/master' into fix-search-when-missing-term 2020-06-05 08:13:11 +02:00
Florian Bosdorff 351c38c9e8 add default value for search term 2020-06-05 08:08:31 +02:00
Jitendra Singh 8a529ce0a8
Merge pull request #3166 from Haendlerbund/copy-cart-rules
make a prefix to the copied cart rule ('copy of XXX')
2020-06-05 11:34:06 +05:30
Florian Bosdorff baa9e3f571 fix tiny issues due to code guidelines 2020-06-05 07:54:47 +02:00
Jitendra Singh 1b60f1b072
Merge pull request #3142 from MattApril/typo
Fixed case sensitivity typo in Bundle class
2020-06-04 19:59:12 +05:30
Jitendra Singh 0fd5e76e33
Merge pull request #3149 from bhumikaisarani/master
Update 503.blade.php
2020-06-04 19:56:05 +05:30
Florian Bosdorff 9219c283fb Merge branch 'bagisto/master' into haendlerbund/copy-cart-rules 2020-06-04 13:05:55 +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
Jitendra Singh b209aac3e7
Merge pull request #3168 from jitendra-webkul/1.0
Issue #3164 fixed
2020-06-03 13:25:39 +05:30
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
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
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
Jitendra Singh 0af7ec0a9e
Merge pull request #3133 from shubhwebkul/master
remove irrelevant code
2020-06-01 19:27:38 +05:30
bhumikaisarani 37c3e2b046
Update 503.blade.php 2020-05-31 16:45:43 +05:30
Matt April 5c067d11de Fixed case sensitivity typo in Bundle class 2020-05-29 12:36:58 -04: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 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 a850cb46ee Merge branch 'HB-master' 2020-05-28 13:34:43 +02:00
Annika Wolff 842c2000db Merge 'master' into HB-master 2020-05-28 13:26:07 +02:00
Annika Wolff 5f10981136 Merge 'master' of https://github.com/Haendlerbund/bagisto 2020-05-28 13:25:47 +02:00
Annika Wolff b9d394f8ae Merge 'bagisto-master' into HB-master 2020-05-28 13:18: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
Jitendra Singh ab682309c3
Merge pull request #3127 from rahulcs0082/development
Issue #3021
2020-05-28 11:43:06 +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
Jitendra Singh 1439dca341
Merge pull request #3126 from rahulcs0082/development
Development
2020-05-27 19:21:59 +05:30