Commit Graph

1596 Commits

Author SHA1 Message Date
jitendra 829ff20396 Updated changelog 2020-08-17 13:34:31 +05:30
jitendra 694a10d06f Resolve conflicts 2020-08-12 13:19:13 +05:30
jitendra cd20e616b1 Changes for admin multi theme system 2020-08-12 13:17:34 +05:30
Jitendra Singh b76f83bd5c
Merge pull request #3728 from rahulcs0082/development
Issue #3561 fixed
2020-08-12 11:38:34 +05:30
rahulshukla-home 4b5aad6a17 Issue #3561 fixed 2020-08-11 23:17:06 +05:30
Herbert Maschke 8614f74b4f Merge branch 'bagisto/master' into introduce-product-copy 2020-08-11 16:54:10 +02:00
Shubham Mehrotra 441740d7a2 #3720 2020-08-11 15:50:04 +05:30
Herbert Maschke c4fdf11633 Merge branch 'bagisto/master' into introduce-product-copy 2020-08-10 17:43:31 +02:00
Jitendra Singh 3d5add129f
Merge pull request #3712 from devansh-webkul/no_alert_message_issue
Fixed no alert message while deleting customer with pending or processing order from admin end #3704
2020-08-10 21:05:03 +05:30
Herbert Maschke 3aeb0c75df ability to define if a product type can be copied in AbstractType.php 2020-08-10 17:24:36 +02:00
Devansh 1920035174 Alert Message Added 2020-08-10 20:52:03 +05:30
Jitendra Singh 4b1fdc04ac
Merge pull request #3705 from devansh-webkul/product_name_blank_issue
Fixed #3656
2020-08-10 19:30:58 +05:30
Jitendra Singh 6572750fcb
Merge pull request #3647 from devansh-webkul/invoice_mail_issue
Fixed customer is getting mails in Arabic for order information and rest mails in English for same order which was placed in ar locale #3519
2020-08-10 18:53:33 +05:30
Devansh 232db8f902 Added Three Column To Group By 2020-08-10 18:34:59 +05:30
Jitendra Singh cad06dd3ec
Merge pull request #3639 from mariapaulinar/add-spanish-lang-for-admin
Add admin spanish language
2020-08-10 18:03:56 +05:30
Herbert Maschke 31a3ebb2b1 Merge branch 'bagisto/master' into introduce-product-copy 2020-08-10 12:17:28 +02:00
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
Jitendra Singh e401da600e
Merge pull request #3665 from cagartner/fix_composer_files
Fix composer files
2020-08-07 14:53:49 +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
Carlos Augusto Gartner ba54e98a3e Created and updated the composer files of the packages 2020-08-05 09:40:59 -03:00
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