Commit Graph

1621 Commits

Author SHA1 Message Date
Jitendra Singh 34b0613d48
Merge pull request #3677 from devansh-webkul/product_name_blank_issue
Fixed #3507, #3656 and #3692
2020-08-10 15:04:22 +05:30
Devansh 2487f5fc58 Checking Case To Avoid Finding All In Find Method So That Only ID Will Be Go To Find Method 2020-08-10 11:26:43 +05:30
Devansh 03c0b9938e Moved Channel Remaining Initialization Property To Constructor As Its Previously Defined There 2020-08-10 09:51:13 +05:30
Herbert Maschke ca79b8b329 avoid 'Copy of Copy of Copy of ...' infinite prefixing of copies 2020-08-07 20:26:42 +02:00
Devansh 9cbabe1a8b Added Locale At The Time Of Order Placed 2020-08-07 16:46:50 +05:30
Devansh 9343f92218 Default Value Implemented 2020-08-07 14:15:20 +05:30
Devansh eadc2cc0a6 Query Builder Fixed 2020-08-06 19:07:48 +05:30
Jitendra Singh d4dc554b71
Merge pull request #3663 from vishal-webkul/issue-3564
Issue #3564 fixed
2020-08-06 17:08:11 +05:30
Devansh ad37f852b9 Merge branch 'invoice_mail_issue' of https://github.com/devansh-webkul/bagisto into invoice_mail_issue 2020-08-06 16:32:28 +05:30
Devansh c6646677f2 Customer Locale Added For All Mail 2020-08-06 16:31:05 +05:30
Devansh 73263fe2a4 Message Added 2020-08-06 13:40:38 +05:30
vishal-webkul 7a9bed0bed resolved interchange problem 2020-08-06 13:11:53 +05:30
Devansh eaa5abc2dd
Merge branch 'master' into invoice_mail_issue 2020-08-06 12:58:07 +05:30
vishal-webkul 59f9c1e559 resolve edit problem 2020-08-06 12:52:07 +05:30
Jitendra Singh f95490eed7
Merge pull request #3666 from devansh-webkul/products_per_page_validation
Fixed add validation for products per page field otherwise if admin entered string value then customer gets exception on category page #3534
2020-08-06 12:47:11 +05:30
Herbert Maschke 4add78351b wrap product copy around a DB::transaction() 2020-08-05 20:48:30 +02:00
Devansh ace7a28579 Comma Seperate Integer Validator Added 2020-08-05 18:20:05 +05:30
vishal-webkul 77213b70fa Issue #3564 fixed 2020-08-05 16:08:17 +05:30
Herbert Maschke ebb6fa0f3e Merge branch 'bagisto/master' into introduce-product-copy 2020-08-05 10:56:35 +02:00
Herbert Maschke f91533f47b add the ability to copy an configurable product 2020-08-05 10:52:13 +02:00
Jitendra Singh 44a753478b
Merge pull request #3602 from devansh-webkul/getting_exception_when_view_order_of_deleted_customer
Fixed getting exception when view order of deleted customer #3422
2020-08-05 12:37:33 +05:30
Jitendra Singh bc8e2f7eac
Merge pull request #3590 from ghermans/master
Fixed #3453
2020-08-05 11:07:17 +05:30
Jitendra Singh 14485e28ea
Merge pull request #3613 from devansh-webkul/translation_issue_on_high_size_image
Fixed translation issue on uploading high size image #3570
2020-08-05 11:06:24 +05:30
Devansh 4b80b19171
Merge branch 'master' into invoice_mail_issue 2020-08-04 18:34:15 +05:30
Devansh 262d72f4b6 Issue Fixed 2020-08-04 18:30:37 +05:30
Devansh 6d4356dc10 Added Space After Exclamation Mark 2020-08-04 18:00:56 +05:30
Devansh 2778f7a7ca Removed One Line 2020-08-04 17:43:44 +05:30
Jitendra Singh 72ce4eea7e
Merge pull request #3619 from devansh-webkul/mail_issue_on_cancel_order
Fixed admin is not getting mail when customer cancels order #3522
2020-08-04 17:26:32 +05:30
Devansh a05fa10309 Refund View Issue Fixed 2020-08-04 16:10:23 +05:30
Jitendra Singh 284fa3f406
Merge pull request #3626 from devansh-webkul/mail_are_not_sent_on_change_password
Completed Enhancement on changing current password admin/customer should get mail #3526
2020-08-04 11:01:34 +05:30
Devansh 19d8ef05ae Favicon Image Issue Fixed 2020-08-04 10:54:45 +05:30
Herbert Maschke 4fecc5011f some more translations 2020-08-03 20:23:52 +02:00
Herbert Maschke 85ac0872ba one more translation 2020-08-03 20:21:11 +02:00
Herbert Maschke d66dca2b13 block the copying of products with the type 'booking' 2020-08-03 20:07:49 +02:00
Herbert Maschke b130bf68cd arabic translation of 'copy of' 2020-08-03 19:52:53 +02:00
María Paulina Ramírez Vásquez 1491c62cc2
Updating file with new translations
This translation is based on Colombian Spanish, however it is valid for most Spanish-speaking countries.
2020-08-02 19:11:40 -05:00
María Paulina Ramírez Vásquez 14d483780f
Add admin spanish language 2020-08-02 19:08:14 -05:00
Devansh 06c05f6ecd Incremental ID Added 2020-08-01 18:20:55 +05:30
Devansh 385eeb2d7e Order ID Added To Subject 2020-08-01 17:03:05 +05:30
Devansh f05b17aa99 Enahancement Done 2020-08-01 15:07:51 +05:30
Devansh 5a25eb14e1 Cancelled Order Mail Issue Fixed 2020-08-01 11:11:52 +05:30
Devansh 9c68a78597 Attribute Added 2020-07-31 16:58:49 +05:30
Devansh 3f7388394c Translation Added 2020-07-31 16:05:30 +05:30
Devansh 8c498dabea Bulk Delete Issue Fixed 2020-07-31 13:46:29 +05:30
Devansh 77636d367f Message Added 2020-07-30 20:16:05 +05:30
Herbert Maschke 0509f45762 introduce ability to copy an product 2020-07-30 14:15:54 +02:00
Devansh dfc346ec76 Order Issue Fixed 2020-07-30 12:40:15 +05:30
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 5ed6fa5dc7 fixed route 2020-07-29 23:01:44 +02:00
ghermans 8c4e1bbc3b Fixed #3595 2020-07-29 22:23:15 +02:00
Glenn Hermans 5bcdcd60f2
Merge branch 'master' into master 2020-07-29 16:24:33 +02:00
Devansh 32140a0e23 Some Enhancement 2020-07-29 19:06:43 +05:30
Glenn Hermans 52163fb78f Moved payment & shipping method 2020-07-29 14:31:59 +02:00
Glenn Hermans 3863ae7b72 fixed requested changes 2020-07-29 14:02:06 +02:00
Glenn Hermans 701d94e62e ready for testing 2020-07-28 16:48:27 +02:00
Glenn Hermans fa120062df Updated translations 2020-07-28 16:45:36 +02:00
Jitendra Singh 74bcf073c1
Merge pull request #3511 from vishal-webkul/issue-3495
Issue #3488 fixed
2020-07-28 18:16:03 +05:30
Annika Wolff cea94c7296
Merge branch 'master' into admin-backend/keep-search-terms-after-new-page-load 2020-07-28 13:21:31 +02:00
Glenn Hermans 7ed5cd4133 Updated Invoices datagrid 2020-07-27 17:08:21 +02:00
Glenn Hermans 80f3befe7c Added translations for invoices 2020-07-27 17:07:50 +02:00
Glenn Hermans c023ee95d7 Init changes for invoices 2020-07-27 17:07:19 +02:00
Annika Wolff 194e8e1395 Merge 'bagisto-master' 2020-07-24 15:06:35 +02:00
Annika Wolff 40aa4848ed Merge remote changes 2020-07-24 15:05:24 +02:00
Annika Wolff 8dec3cdd14 show filtered channels, locales and customer groups by name 2020-07-24 15:04:20 +02:00
rahulshukla-home ecba982184 Issue #3561 fixed 2020-07-24 12:18:26 +05:30
vishal-webkul 1ae5ad201f
Merge branch 'master' into issue-3495 2020-07-22 09:39:00 +05:30
Jitendra Singh 25a3d93c31
Merge pull request #3529 from devansh-webkul/admin-email-in-default-locale
Admin should get mail according to admin's default locale issue fixed #3520
2020-07-21 19:52:25 +05:30
Jitendra Singh c8dd07c8c8
Merge pull request #3537 from jitendra-webkul/1.0
Issue #3451 fixed
2020-07-20 23:04:05 +05:30
jitendra ba8151c223 Issue #3451 fixed 2020-07-20 23:03:16 +05:30
Devansh 9f7b3dd5ee Admin Email In Their Default Locale 2020-07-20 16:34:09 +05:30
rahulshukla-home 17a2309217 Issue #3490 fixed 2020-07-20 11:11:30 +05:30
rahulshukla-home ecf9b3cd84 Issue #3502 2020-07-17 14:45:37 +05:30
vishal-webkul 66a7b40bbc color attribute default swatch value should be selected as dropdown swatch - issue fixed #3488 2020-07-17 13:29:47 +05:30
vishal-webkul 0f998d9e57 Back icon is not working in catalog and cart rule grid - Bug Fixed 2020-07-16 12:20:01 +05:30
rahulshukla-home 012b2c2b6b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-07-14 18:04:16 +05:30
rahulshukla-home 6b648bf69c dependent field issue 2020-07-14 18:01:52 +05:30
olaysco e09bf9efb1 include config seeders to enable social login by default 2020-07-10 17:22:11 +01:00
rahulshukla-home 2b9651fd77 Issue #3310 fixed 2020-07-07 15:39:58 +05:30
Jitendra Singh ce0ec932cd
Merge pull request #3435 from jitendra-webkul/1.0
Fixed issue in order view page if customer group is null
2020-07-07 12:38:59 +05:30
jitendra fdb214ec22 Fixed issue in order view page if customer group is null 2020-07-07 12:20:51 +05:30
rahulshukla-home 4c76fb27e9 Issue #3409 fixed 2020-07-06 16:54:16 +05:30
ghermans 105d6fd566 fixed #3381 2020-07-02 22:13:35 +02:00
rahulshukla-home 1cd7f76a3d Issue #3392 fixed 2020-07-02 14:57:31 +05:30
Pranshu Tomar 35b200a7cf Issue #3331 fixed 2020-06-24 17:31:28 +05:30
Pranshu Tomar ad6bab6a3a Remove button will be enabled by default in date component 2020-06-19 14:49:58 +05:30
Pranshu Tomar 9a4adc50ab Issue #3289 fixed 2020-06-19 14:01:22 +05:30
Pranshu Tomar 8478a4a710 Issue #3222 fixed 2020-06-19 13:43:32 +05:30
Pranshu Tomar a7a4fd12e5 Issue #3246 fixed 2020-06-19 13:06:16 +05:30
Pranshu Tomar 87b3f2acdc Conflicts resolved 2020-06-18 15:58:18 +05:30
Pranshu Tomar 6840198571 Issue #3273 fixed 2020-06-18 15:55:05 +05:30
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
Roman Berneburg 05c3012eda german translations for Customer, Admin, Shop 2020-05-13 16:49:49 +02:00
Jan Bickel b1c3f7f3d0 german translations shop and admin 2020-05-13 16:49:40 +02:00
Jan Bickel 64e5f19861 german translations 2020-05-13 16:49:17 +02:00
Jan Bickel eae82352f7 german translations
# Conflicts:
#	packages/Webkul/Velocity/src/Resources/assets/js/app.js
2020-05-13 16:49:14 +02:00
Roman Berneburg a1f4a29b28 translation 2020-05-13 16:46:50 +02:00
Roman Berneburg 74dfa77cd0 translation 2020-05-13 16:45:45 +02:00
Jan Bickel 35948d7acb admin german translation 2020-05-13 16:45:18 +02:00
Jan Bickel a8f8ecc23f added: files for translation 2020-05-13 16:44:53 +02:00
Jitendra Singh f3a49b35de
Merge pull request #3033 from Haendlerbund/flexible-exception-handling
Improve exception handler
2020-05-13 12:53:44 +05:30
Jitendra Singh 4af22ad5df
Merge pull request #3034 from Haendlerbund/fix-namespace-issues
fix namespace issues
2020-05-13 12:53:21 +05:30