Commit Graph

6196 Commits

Author SHA1 Message Date
Devansh ea6cdd99b5 Just Handled Some Exceptions 2020-08-11 20:31:38 +05:30
Devansh 8d93eb640f Foreign Key Cascade Removed 2020-08-11 20:17:04 +05:30
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
Devansh 1920035174 Alert Message Added 2020-08-10 20:52:03 +05:30
Jitendra Singh b46d8e2a24
Merge pull request #3709 from shubhwebkul/patch-1
Issue #3486 resolved
2020-08-10 20:33:18 +05:30
Shubham Mehrotra f3ebec2833 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-08-10 19:48:32 +05:30
Shubham Mehrotra 38e7270ba9 #3486 2020-08-10 19:46:59 +05:30
Shubham Mehrotra 8377c8dc8f #3486 2020-08-10 19:43:14 +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 1a0029361d
Merge pull request #3708 from jitendra-webkul/master
Support multi admin theme
2020-08-10 19:30:21 +05:30
jitendra 9c0ec6f644 Support multi admin theme 2020-08-10 19:25:51 +05:30
Jitendra Singh 41725a671f
Merge pull request #3707 from bagisto/revert-3706-1.0
Revert "Multi theme system now supported in admin"
2020-08-10 19:07:42 +05:30
Jitendra Singh c4abe9cad3
Revert "Multi theme system now supported in admin" 2020-08-10 19:07:32 +05:30
Jitendra Singh 6276505fd3
Merge pull request #3706 from jitendra-webkul/1.0
Multi theme system now supported in admin
2020-08-10 19:06:53 +05:30
jitendra 37e7c4c834 Merged with master 2020-08-10 19:02:15 +05:30
jitendra 44181411bd Multi theme system now supported in admin 2020-08-10 19:00:31 +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 d7983e560d
Merge pull request #3703 from rahulcs0082/development
Issue #3494 fixed
2020-08-10 18:27:52 +05:30
rahulshukla-home 84ba38ca2a code updated 2020-08-10 18:17:39 +05:30
rahulshukla-home 5663afec6a Issue #3494 fixed 2020-08-10 18:14:38 +05:30
Jitendra Singh ca7400d4d1
Merge pull request #3698 from devansh-webkul/no_success_message
Fixed there should not be any success message while trying to delete system attributes #3693
2020-08-10 18:04:36 +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
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
Jitendra Singh aea0e374c1
Merge pull request #3691 from devansh-webkul/ios_icon_issue
Fixed on mobile responsive on ios sign up button is missing #3365
2020-08-10 14:23:53 +05:30
Jitendra Singh 94135f9cf6
Merge pull request #3690 from rahulcs0082/development
Issue #3689 and 3674 fixed
2020-08-10 14:23:39 +05:30
Devansh 5eda4c4fdc Message Replaced 2020-08-10 13:53:12 +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 5c663c4f06 Message Removed 2020-08-10 11:06:46 +05:30
Devansh 03c0b9938e Moved Channel Remaining Initialization Property To Constructor As Its Previously Defined There 2020-08-10 09:51:13 +05:30
Devansh e66bbf0fdb Sign Up Button Added 2020-08-07 18:31:00 +05:30
Devansh c956389251 Fixed Code According To Test Case 2020-08-07 17:30:06 +05:30
Devansh 9cbabe1a8b Added Locale At The Time Of Order Placed 2020-08-07 16:46:50 +05:30
rahulshukla-home 025c761250 Issue #3689 and 3674 fixed 2020-08-07 16:42:51 +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
Jitendra Singh 042438e767
Merge pull request #3687 from rahulcs0082/development
Issue #3411 fixed
2020-08-07 14:51:43 +05:30
Jitendra Singh a9f748ab72
Merge pull request #3686 from devansh-webkul/email_settings_add_on
Fixed email settings are empty in backend #3243
2020-08-07 14:51:23 +05:30
Devansh 9343f92218 Default Value Implemented 2020-08-07 14:15:20 +05:30
rahulshukla-home d0921af1d4 Issue #3411 fixed 2020-08-07 12:15:48 +05:30
Jitendra Singh 836d741bba
Merge pull request #3685 from shubhwebkul/patch-1
add address btn updated z-index
2020-08-07 12:05:38 +05:30
Shubham Mehrotra 006ae89b32 add address btn updated z-index 2020-08-07 11:49:24 +05:30
Jitendra Singh 4e2b4bba56
Merge pull request #3680 from rahulcs0082/development
Development
2020-08-07 10:56:10 +05:30
Jitendra Singh 0dbee8bfa2
Merge pull request #3681 from shubhwebkul/patch-2
Issue #3675 resolved
2020-08-07 10:38:35 +05:30
Shubham Mehrotra 124680d665 #3675 2020-08-06 20:22:14 +05:30
rahulshukla-home 6917e1e266 Issue #3676 fixed 2020-08-06 19:54:49 +05:30
rahulshukla-home 4b4d94a3be merge with master 2020-08-06 19:17:34 +05:30
rahulshukla-home a58f4deeec Issue #3674 fixed 2020-08-06 19:14:21 +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
Jitendra Singh 774f523bdd
Merge pull request #3655 from devansh-webkul/tooltip_placement
Enhancement completed there should be tooltip text on mouse hover on compare icon on product #3550
2020-08-06 17:07:38 +05:30