Commit Graph

6857 Commits

Author SHA1 Message Date
Devansh 4d0114ab36
Merge branch 'master' into rtl_issue 2020-09-02 13:22:01 +05:30
Devansh f8e441ef32 Padding Removed From New Product 2020-09-02 13:18:21 +05:30
Jitendra Singh a3b9c053e6
Merge pull request #3864 from jitendra-webkul/master
Issues #3862, #3861 fixed
2020-09-02 13:06:11 +05:30
jitendra 1ec28bc134 Added remaining changes 2020-09-02 12:58:54 +05:30
jitendra f059be602a Issues #3862, #3861 fixed 2020-09-02 12:57:01 +05:30
Jitendra Singh 7603579fa6
Merge pull request #3859 from akhtarkhan1/password-alert-message
Fixed Issue #3854
2020-09-02 12:13:43 +05:30
Akhtar Khan b85f1efa84 Change Error Message 2020-09-02 11:44:55 +05:30
Akhtar Khan ced3907595 final fixed 2020-09-02 11:10:21 +05:30
Jitendra Singh 6694469e87
Merge pull request #3863 from rahulcs0082/development
Issue #3847 fixed
2020-09-02 10:47:38 +05:30
Jitendra Singh 8ea800d40f
Merge pull request #3856 from vishal-webkul/issue-3852
Issue 3852 fixed
2020-09-02 10:42:28 +05:30
rahulshukla-home 22b3d11e01 Issue #3847 fixed 2020-09-02 10:37:54 +05:30
Akhtar Khan 9657a99774 Fixed Issue 3854 2020-09-01 18:50:20 +05:30
Devansh 542b7bba87 Merge branch 'master' into rtl_issue
Merged
2020-09-01 17:58:58 +05:30
Devansh e0e0545348 Compare Icon Issue Fixed 2020-09-01 17:56:42 +05:30
Jitendra Singh 2ab7ca98db
Merge pull request #3857 from jitendra-webkul/master
Added some config for payment method additional information
2020-09-01 17:47:59 +05:30
jitendra 8570ba7838 Resolve conflicts 2020-09-01 17:47:10 +05:30
jitendra ef3cdc8deb Added some config for payment method additional information 2020-09-01 17:45:02 +05:30
vishal.kushwaha650 4ced6d0ace Issue 3852 fixed 2020-09-01 15:49:43 +05:30
Annika Wolff 76dbdb42dd fix adding multiple booking products to cart 2020-09-01 10:50:16 +02:00
Herbert Maschke 5f526bcfc6 fix type declaration 2020-09-01 08:10:47 +02:00
Herbert Maschke cb32fe31bf ability to globally set a callable for isSaleable 2020-09-01 07:59:00 +02:00
Jitendra Singh 63cced9d69
Merge pull request #3851 from devansh-webkul/reverting_feature
Reverted Invoice Feature
2020-08-31 19:42:29 +05:30
Devansh 16c5b26af2 Reverted Invoice Feature 2020-08-31 18:26:24 +05:30
Jitendra Singh 744e6b179e
Merge pull request #3850 from devansh-webkul/invoice_minor_bug
Some Minor Encoding Issue Fixed
2020-08-31 16:37:54 +05:30
Devansh 576b878998 Some Minor Encoding Issue Fixed 2020-08-31 15:06:07 +05:30
Jitendra Singh 88801561a7
Merge pull request #3840 from Haendlerbund/fix-product-attribute-generation-in-laravel5helper
fix product generation for tests
2020-08-29 13:08:09 +05:30
Jitendra Singh b4010a3d67
Merge pull request #3844 from Haendlerbund/product-datagrid-show-all-products
ProductDataGrid: Really show all products if it is wished
2020-08-29 13:07:29 +05:30
Jitendra Singh c3e6b96ad8
Merge pull request #3845 from devansh-webkul/invoice_enhancemnt
UTF-8 And Font Added #3643
2020-08-28 21:44:13 +05:30
Devansh 78a8a95b26 Encoding Adjusted 2020-08-28 21:26:18 +05:30
Annika Wolff 34d41aac2b really show all products if it is wished 2020-08-28 15:47:31 +02:00
Jitendra Singh a5f57b2e5f
Merge pull request #3836 from devansh-webkul/invoice_enhancement
Enhancement Completed #3643
2020-08-28 16:23:14 +05:30
Devansh 18b0bd36ae Merge branch 'master' into invoice_enhancement
Merged With Master
2020-08-28 16:14:18 +05:30
Devansh 90f1885024 Some Changes Done 2020-08-28 13:27:11 +05:30
Devansh ce9dba5ff7 Some Adjustment Done 2020-08-28 01:33:24 +05:30
Devansh d5ccdb03a8 Translation Added 2020-08-28 00:56:33 +05:30
Devansh 3a35028dfc Invoice Added In Center 2020-08-28 00:41:37 +05:30
Devansh 4f8040b0df Removed DD 2020-08-28 00:20:02 +05:30
Devansh cc425ad13a Two Seperate Form Merged 2020-08-28 00:09:28 +05:30
Steffen Mahler 2fc815dece fix missing product attribute fields 2020-08-27 13:14:31 +02:00
Jitendra Singh 146338e2a4
Merge pull request #3839 from devansh-webkul/master
Two Cases Added For API
2020-08-27 14:50:37 +05:30
Devansh 9472a4af15 Two Cases Added For API 2020-08-27 13:52:53 +05:30
Annika Wolff 0c0dc1d4b4 handle ordered inventory only if product has an inventory, add logging 2020-08-26 16:03:32 +02:00
Devansh 64c80783f8 Added To Default And Velocity Customer 2020-08-26 18:33:22 +05:30
Jitendra Singh 196b29c446
Merge pull request #3835 from vishal-webkul/issue-3831
Issue #3831 fixed
2020-08-26 16:50:03 +05:30
Devansh 5db87dba8e Merge branch 'master' into invoice_enhancement
Merged With Master
2020-08-26 16:25:00 +05:30
Devansh 10f123ccd1 Language Translation Added 2020-08-26 16:21:11 +05:30
Devansh b2e30dcff6 More Merchant Details Added 2020-08-26 16:05:57 +05:30
Jitendra Singh 58b731f495
Merge pull request #3816 from vishal-webkul/issue-3811
Issue #3811 fixed
2020-08-26 15:17:24 +05:30
vishal.kushwaha650 d34e35b23f Issue #3831 fixed 2020-08-26 14:59:55 +05:30
Jitendra Singh cbca1b3fc8
Merge pull request #3833 from devansh-webkul/master
Lang Folder Added To Git Ignore
2020-08-26 13:23:48 +05:30