Commit Graph

4755 Commits

Author SHA1 Message Date
Jitendra Singh 74faff50e8
Merge pull request #3753 from cagartner/fix_inventory_composer
Fix inventory composer
2020-08-17 11:26:10 +05:30
rahulshukla-home 0bdc1acef5 compile assests 2020-08-14 15:29:14 +05:30
rahulshukla-home 76afd9329c Issue #3757 and CI check fail issue 2020-08-14 15:25:37 +05:30
Jitendra Singh 38c3b50772
Merge pull request #3758 from devansh-webkul/responsive_issue
Fixed velocity theme layout not responsive #3754
2020-08-14 13:28:05 +05:30
rahulshukla-home 395a276d59 change code 2020-08-14 12:21:42 +05:30
Jitendra Singh 25d7ede2f9
Merge pull request #3699 from devansh-webkul/coupon_code_api
Enhancement Completed API for coupons #3030
2020-08-14 12:01:14 +05:30
Jitendra Singh 5b05e5744f
Merge pull request #3694 from devansh-webkul/api_current_user_issue
Fixed auth user can see all users info by id #3657
2020-08-14 12:00:57 +05:30
Devansh 04ac7fe3cc Merged With Master 2020-08-14 11:49:00 +05:30
Devansh 9c7720cb55 Responsive Issue Fixed 2020-08-14 11:44:07 +05:30
Shubham Mehrotra 45d67ce114 #3747 2020-08-14 10:55:22 +05:30
Jitendra Singh 518e0bc74b
Merge pull request #3752 from devansh-webkul/shipping_disable_issue
Fixed shipping tab is missing in order details for deleted customer #3751
2020-08-13 20:25:28 +05:30
Carlos Augusto Gartner 68b1a0e09e Fix paypal composer map 2020-08-13 10:43:57 -03:00
Carlos Augusto Gartner 976e1d8c76 Removed require from packages, leave the require on the root project 2020-08-13 09:46:43 -03:00
Carlos Augusto Gartner cbc5a8d7b9 Removed require option not used 2020-08-13 09:41:59 -03:00
Jitendra Singh 3247c5ad4e
Merge pull request #3750 from devansh-webkul/migration_issue
Migration Issue Fixed
2020-08-13 17:21:07 +05:30
Devansh 50dad5e55e Shipping Details Issue Fixed 2020-08-13 16:45:54 +05:30
Jitendra Singh fc1884c711
Merge pull request #3614 from autn/feat/cms/update-cms-page-translations-table-field-html-content-from-text-to-longtext
Update cms_page_translations table field html content from text to longtext
2020-08-13 16:25:09 +05:30
Devansh 3585796f8f Merge branch 'master' into migration_issue
Merging with master
2020-08-13 16:03:01 +05:30
Devansh e40d86fea8 Remove Unsed Imports 2020-08-13 16:02:11 +05:30
Devansh 5e7474d307 Migration Issue Fixed 2020-08-13 15:59:32 +05:30
Jitendra Singh 4d00f4fcc5
Merge pull request #3718 from vishal-webkul/issue3564
Issue #3564 resolved
2020-08-13 15:42:04 +05:30
vishal.kushwaha650 8b78ba8ee7 update in code 2020-08-13 15:30:13 +05:30
Jitendra Singh 97eb72bd64
Merge pull request #3715 from devansh-webkul/downloadable_product_issue
Fixed customer is able to access downloadable products even when invoice state is pending #3678
2020-08-13 15:20:28 +05:30
Jitendra Singh 5539839879
Merge pull request #3741 from vishal-webkul/issue-3740
Issue #3740 fixed
2020-08-13 15:14:57 +05:30
Jitendra Singh 05ec4bf151
Merge pull request #3744 from devansh-webkul/guest_button_issue
Fixed invoice, ship and cancel buttons are missing in order placed by guest user #3742
2020-08-13 15:12:04 +05:30
Devansh 90b4a223a7 Issue Fixed 2020-08-13 13:33:03 +05:30
Devansh ee444107f3 Issue Fixed 2020-08-13 12:52:26 +05:30
vishal.kushwaha650 45ab987360 issue #3740 fixed 2020-08-13 11:46:58 +05:30
Jitendra Singh 8514421cf0
Merge pull request #3682 from Haendlerbund/refactoring-cart-adding-tests
refactoring of cart.php, fix issue in booking product,
2020-08-12 21:42:06 +05:30
vishal.kushwaha650 78f0cbf785 add validation for image type 2020-08-12 20:43:05 +05:30
Carlos Augusto Gartner f9781f01e2 Fix API composer name 2020-08-12 11:25:25 -03:00
vishal.kushwaha650 875ab07abc provide configuration for max file size 2020-08-12 17:12:53 +05:30
Jitendra Singh b31d122924
Merge pull request #3726 from devansh-webkul/invoice_shipment_hard_delete_issue
Fixed on deleting customer their invoice and shipment records are getting disappeared #3702
2020-08-12 16:51:48 +05:30
Jitendra Singh aa9fba19ce
Merge pull request #3733 from rahulcs0082/development
Issue #3700 fixed
2020-08-12 16:51:41 +05:30
rahulshukla-home 22edde17ce Issue #3700 fixed 2020-08-12 16:25:35 +05:30
Devansh f8521b9a53 Merge branch 'master' into api_current_user_issue
Master Merged
2020-08-12 15:20:42 +05:30
Devansh e819afe51e Merge branch 'master' into coupon_code_api
Master Merged
2020-08-12 15:18:55 +05:30
Devansh c319540491 Merge branch 'master' into downloadable_product_issue
Master Merged
2020-08-12 15:17:50 +05:30
Devansh f75a9bfb83 Merge branch 'master' into invoice_refund_exception
Merged
2020-08-12 15:16:46 +05:30
Devansh 51db8daab2 Merge branch 'master' into invoice_shipment_hard_delete_issue
Merged
2020-08-12 15:13:31 +05:30
Devansh 10f42eeacc Exception Handled 2020-08-12 14:22:48 +05:30
Devansh 254020c010 Handled Some Exception 2020-08-12 13:19:49 +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
Devansh 1f87680045 Previous One Reverted And Added New Migration 2020-08-12 13:04:45 +05:30
Jitendra Singh ce450cbfec
Merge pull request #3729 from shubhwebkul/patch-1
Issue #3727 #3725 resolved
2020-08-12 12:20:07 +05:30
Jitendra Singh b76f83bd5c
Merge pull request #3728 from rahulcs0082/development
Issue #3561 fixed
2020-08-12 11:38:34 +05:30
Shubham Mehrotra 8ed48f41f2 #3725 2020-08-12 10:48:02 +05:30
Shubham Mehrotra 2e275ec7ef #3727 2020-08-12 10:42:51 +05:30
rahulshukla-home 4b5aad6a17 Issue #3561 fixed 2020-08-11 23:17:06 +05:30