Commit Graph

6295 Commits

Author SHA1 Message Date
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 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
Jitendra Singh d92ea507e5
Merge pull request #3738 from cagartner/fix_composer_api
Fix API composer name
2020-08-12 20:08:35 +05:30
Carlos Augusto Gartner f9781f01e2 Fix API composer name 2020-08-12 11:25:25 -03:00
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
Jitendra Singh be868bdb74
Merge pull request #3710 from devansh-webkul/invoice_refund_exception
Fixed #3700 and #3679
2020-08-12 16:51:22 +05:30
rahulshukla-home 22edde17ce Issue #3700 fixed 2020-08-12 16:25:35 +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
Jitendra Singh 56ab693f01
Merge pull request #3732 from rahulcs0082/development
Development
2020-08-12 15:05:07 +05:30
rahulshukla-home c569fe65b9 testing updated 2020-08-12 15:02:23 +05:30
rahulshukla-home 1f3be04e46 Test cases failure fixed 2020-08-12 15:01:10 +05:30
Jitendra Singh 47d0337a6d
Merge pull request #3731 from jitendra-webkul/master
Updated composer.lock
2020-08-12 14:45:30 +05:30
jitendra f73887e5aa Updated composer.lock 2020-08-12 14:44:40 +05:30
Devansh 10f42eeacc Exception Handled 2020-08-12 14:22:48 +05:30
jitendra 40357f57c9 Removed dev dependencies from require in composer.json 2020-08-12 13:51:12 +05:30
Jitendra Singh 397bf6370a
Merge pull request #3730 from jitendra-webkul/master
Changes for admin multi theme system
2020-08-12 13:19:56 +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
Jitendra Singh 2c3a8ec404
Merge pull request #3605 from Haendlerbund/introduce-product-copy
introduce ability to copy an product
2020-08-12 11:35:17 +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
Devansh ea6cdd99b5 Just Handled Some Exceptions 2020-08-11 20:31:38 +05:30
Herbert Maschke 8614f74b4f Merge branch 'bagisto/master' into introduce-product-copy 2020-08-11 16:54:10 +02:00
Herbert Maschke 9109d93028 Disallow copying of product variants (having a parent_id) 2020-08-11 16:53:09 +02:00
Devansh 8d93eb640f Foreign Key Cascade Removed 2020-08-11 20:17:04 +05:30
Jitendra Singh 4ff760920b
Merge pull request #3724 from rahulcs0082/development
Development
2020-08-11 19:08:40 +05:30
rahulshukla-home c39c3a0ea1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-08-11 18:59:28 +05:30
rahulshukla-home 3a2998cab1 Issue #3723 fixed 2020-08-11 18:58:31 +05:30
Jitendra Singh 8d7faa865c
Merge pull request #3695 from devansh-webkul/adding_missing_translation
Added missing translations
2020-08-11 18:49:52 +05:30
Jitendra Singh bebcf38f9c
Merge pull request #3711 from akhtarkhan1/select_icon_payment_page
issued fixed #3688
2020-08-11 18:46:06 +05:30
Jitendra Singh 65f94c439f
Merge pull request #3722 from rahulcs0082/development
Issue #3638 fixed
2020-08-11 18:30:09 +05:30
rahulshukla-home bed01ea9c9 Issue #3638 fixed 2020-08-11 18:22:14 +05:30
Devansh 61f0e0f296
Merge branch 'master' into adding_missing_translation 2020-08-11 17:38:49 +05:30
Jitendra Singh e19694b98a
Merge pull request #3721 from shubhwebkul/patch-2
Issue #3720 resolved
2020-08-11 16:59:17 +05:30
Jitendra Singh aaf0d5c962
Merge pull request #3719 from rahulcs0082/development
Issue #3717 fixed
2020-08-11 16:58:54 +05:30
Jitendra Singh 07c6832ab2
Merge pull request #3714 from shubhwebkul/patch-1
compare count update in default theme
2020-08-11 16:58:28 +05:30
Shubham Mehrotra 441740d7a2 #3720 2020-08-11 15:50:04 +05:30
Herbert Maschke 007eaa7ef2 code style improvements 2020-08-11 09:43:03 +02:00
Herbert Maschke 3e3681db5a add testBlockProductCopy 2020-08-11 09:31:11 +02:00
rahulshukla-home c8a70f7f36 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-08-11 12:04:31 +05:30
Shubham Mehrotra bcc87623d8 updates 2020-08-11 12:04:10 +05:30
rahulshukla-home ddcad7544c Issue #3717 fixed 2020-08-11 12:02:54 +05:30