Commit Graph

6538 Commits

Author SHA1 Message Date
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 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
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
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
Devansh a45cb01261 Some Files Are Ignored 2020-08-26 13:08:39 +05:30
Jitendra Singh 2183f09d91
Merge pull request #3832 from devansh-webkul/env_validator
Fixed getting error on running php artisan migrate if db_prefix contains decimal value #3782
2020-08-26 12:50:55 +05:30
Devansh 297a3249f8 Some Adjustment Done 2020-08-26 11:42:12 +05:30
vishal.kushwaha650 64a51b0746 fix velocity locale problem footer middle content 2020-08-26 10:32:19 +05:30
Jitendra Singh cc14e90905
Merge pull request #3829 from asif-webkul/master
fixed issue #3828
2020-08-25 19:20:56 +05:30
Devansh fdd6881076 Env Validator Added 2020-08-25 17:21:20 +05:30
Jitendra Singh 06d28efc7c
Merge pull request #3818 from akhtarkhan1/new-product-featured-product
issue fixed #3799
2020-08-25 12:02:00 +05:30
vishal.kushwaha650 c768750898 update code 2020-08-25 09:26:37 +05:30
Jitendra Singh 069a1805ab
Merge pull request #3827 from ghermans/3822
fixed #3822
2020-08-24 20:45:51 +05:30
mohd asif ae1277ddb0 added translation for all locale 2020-08-24 20:21:23 +05:30
Glenn Hermans ecd25e43cf
Fixed typo 2020-08-24 16:38:25 +02:00
vishal.kushwaha650 0b4cd1f557 update base url 2020-08-24 17:38:18 +05:30
Jitendra Singh 76aed90a62
Merge pull request #3803 from vishal-webkul/issue-3786
Issue #3786 fixed
2020-08-24 16:31:16 +05:30
vishal.kushwaha650 a17ad786f5 Fix page url problem 2020-08-24 16:24:39 +05:30
mohd asif 557f9ec7c8 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-08-24 15:40:10 +05:30
Jitendra Singh 8417df849b
Merge pull request #3830 from devansh-webkul/master
Fixed Cross Icon Issue
2020-08-24 15:39:29 +05:30
Jitendra Singh fcf778962e
Merge pull request #3801 from deepaksinghgusain227/fix-newsletter-subscription-problem
Fix Newsletter Subscription Problem #3789
2020-08-24 15:37:42 +05:30
Devansh d4f0f6a654 Cross Icon Issue Fixed 2020-08-24 14:55:22 +05:30