Commit Graph

6354 Commits

Author SHA1 Message Date
jitendra f93cf2ef80 Resolved conflicts 2020-08-17 13:36:04 +05:30
Jitendra Singh 3688a98e48
Merge pull request #3766 from devansh-webkul/meta_data_channel_wise_enhancement
Fixed velocity meta data section channel wise #3735
2020-08-17 13:34:56 +05:30
jitendra 829ff20396 Updated changelog 2020-08-17 13:34:31 +05:30
Devansh d575e0f30f Minor Change Added 2020-08-17 12:59:47 +05:30
Devansh 46f4c43654 Selected Channel Added 2020-08-17 12:40:21 +05:30
jitendra c021fb3fc8 Updated changelog 2020-08-17 12:17:28 +05:30
Jitendra Singh e88cb8b9e1
Merge pull request #3769 from rahulcs0082/development
Development
2020-08-17 12:17:12 +05:30
rahulshukla-home f36dc4f545 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-08-17 11:49:01 +05:30
rahulshukla-home 9985c9689b date updated in chnage log 2020-08-17 11:47:23 +05:30
Devansh 75e3df73df Channel Wise Data Done 2020-08-17 11:28:12 +05:30
Jitendra Singh 74faff50e8
Merge pull request #3753 from cagartner/fix_inventory_composer
Fix inventory composer
2020-08-17 11:26:10 +05:30
Devansh ee4c50add4 Channel Wise Issue Fixed 2020-08-15 11:16:19 +05:30
Jitendra Singh d2495e71bb
Merge pull request #3761 from vishal-webkul/issue-3755
Issue #3755 fixed
2020-08-14 15:53:39 +05:30
Jitendra Singh df4ed869a4
Merge pull request #3762 from rahulcs0082/development
Issue #3757 and CI check fail issue
2020-08-14 15:35:20 +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
vishal.kushwaha650 947258ba23 issue #3755 fixed 2020-08-14 14:41:42 +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
Jitendra Singh 246bbbf974
Merge pull request #3759 from rahulcs0082/development
change code
2020-08-14 13:03:11 +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
Jitendra Singh a8ff1368e1
Merge pull request #3756 from shubhwebkul/patch-1
Issue #3747 resolved
2020-08-14 12:00:11 +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 134998e2bf
Merge pull request #3749 from jitendra-webkul/master
Updated changelog
2020-08-13 15:43:36 +05:30
Jitendra Singh 4d00f4fcc5
Merge pull request #3718 from vishal-webkul/issue3564
Issue #3564 resolved
2020-08-13 15:42:04 +05:30
jitendra 747824c21c Updated changelog 2020-08-13 15:40:16 +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
Jitendra Singh d5991814b8
Merge pull request #3746 from devansh-webkul/db_prefix_issue
Fixed getting exception in backend when having DB_PREFIX #3745
2020-08-13 15:11:47 +05:30
Jitendra Singh 6a0f7db17b
Merge pull request #3748 from jitendra-webkul/master
Updated changelog
2020-08-13 15:11:07 +05:30
jitendra a7c706860c Updated changelog 2020-08-13 15:10:06 +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