Commit Graph

1431 Commits

Author SHA1 Message Date
ahmedusama250 33947fc72c
Merge pull request #1 from bagisto/master
Catalog Rules missing in the permissions list
2020-06-17 14:00:09 +02:00
Shubham Mehrotra 976cd9f940 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-2 2020-06-17 10:24:44 +05:30
Shubham Mehrotra bf8828326d resolved design issues 2020-06-17 10:21:55 +05:30
AhmedUsama 74d4c15cdf fix in route in permissions of catalog roles 2020-06-17 00:07:46 +02:00
AhmedUsama a5dd53299c Add catalog rules in permissions list in select tree of role 2020-06-16 23:58:42 +02:00
Pranshu Tomar 2ed98a2838 Issue #3237 fixed 2020-06-16 19:49:01 +05:30
Pranshu Tomar 65fddfc20d Issue #3246 fixed 2020-06-16 19:27:53 +05:30
Jitendra Singh 9f27e46d5c
Merge pull request #3239 from ghermans/development
Customer details
2020-06-16 13:03:50 +05:30
Shubham Mehrotra c23d58bc38 resolved rtl design issues 2020-06-15 17:26:22 +05:30
shubhammehrotra.symfony@webkul.com 90eed2792b previous changes 2020-06-15 13:45:59 +05:30
ghermans 7b47e1f173 Added customer overview 2020-06-15 04:29:00 +02:00
Jitendra Singh 497412abfd
Merge pull request #3201 from shivam-webkul/master
#3197 solved
2020-06-11 12:04:31 +05:30
shivam kumar 94fb0c3d24 #3068 resolved & code updated 2020-06-11 11:36:32 +05:30
shivam kumar 65cef43a0b #3068 resolved 2020-06-10 20:07:50 +05:30
Shubham Mehrotra faa3f6e572 #3207 2020-06-10 15:45:33 +05:30
Shubham Mehrotra 2c9d8de97f remove changes 2020-06-10 15:26:32 +05:30
Shubham Mehrotra 06d025ffed #3203 2020-06-10 15:10:47 +05:30
Herbert Maschke 5c2db445b8
Remove redundant filter in cart rule index page 2020-06-08 13:00:53 +02:00
Jitendra Singh ee708f9df4
Merge pull request #3180 from jitendra-webkul/1.0
Issue #3070 fixed
2020-06-05 18:43:37 +05:30
Pranshu Tomar 31b9ae7e3e Issue #3070 fixed 2020-06-05 18:41:38 +05:30
phillipcodes 8867eccd90
fix typo 2020-06-05 11:59:52 +02:00
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 d75059254b
Merge pull request #3134 from Haendlerbund/cart-rule-validator-extension
Cart rule validator extension
2020-06-03 19:39:04 +05:30
İlyas Okay 77e0610c89 Turkish Language added and English language duplicate rows deleted. 2020-06-03 16:22:23 +03:00
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
Annika Wolff 4104a7b2ba Merge bagisto/master into cart-rule-validator-extension 2020-06-03 07:36:43 +02:00
Annika Wolff ca6933d3a8 add english translation to foreign languages 2020-06-03 07:15:56 +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 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
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 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
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
Steffen Mahler f04abcbc85 add field company_name to views 2020-05-22 08:31:11 +02:00
Steffen Mahler d0d6f2b046 add field company_name to bliss views 2020-05-20 17:44:03 +02:00
Jitendra Singh 4ef9e3b683
Merge pull request #3094 from rahulcs0082/development
Issue #3073
2020-05-19 19:20:11 +05:30
rahulshukla-home f3dd1e4d99 Issue #3073 2020-05-19 18:46:43 +05:30
Jitendra Singh 84aede5cef
Merge pull request #3088 from jitendra-webkul/1.0
Rich snippet feature added for products and category
2020-05-18 23:08:33 +05:30
Pranshu Tomar 94e4a165eb Added translations to other languages 2020-05-18 23:07:12 +05:30
Pranshu Tomar 072b56930b Rich snippet feature added for products and category 2020-05-18 23:04:09 +05:30
Jitendra Singh 2ea98d4089
Merge pull request #3064 from kmso-de/feature/german-translation
Feature/german translation
2020-05-15 17:02:08 +05:30
Jan Bickel eb5de5acdf added localize to admin 2020-05-15 07:56:41 +02:00
Jan Bickel 755874e0ae removed Validator.localize('de', de) & Vue.use(VeeValidate) 2020-05-15 07:51:53 +02:00
Jitendra Singh c26a759fbc Added polish language 2020-05-13 20:22:25 +05:30