Commit Graph

4964 Commits

Author SHA1 Message Date
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
Devansh 16c5b26af2 Reverted Invoice Feature 2020-08-31 18:26:24 +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
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
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
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 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
Glenn Hermans a1331bd6ce
Merge pull request #35 from bagisto/master 2020-08-24 11:09:16 +02:00
Jitendra Singh d0e6696397
Merge pull request #3817 from devansh-webkul/layout_issue
Fixed layout issue while adding linked products #3802
2020-08-24 14:10:56 +05:30
mohd asif 4d6380a873 fixed issue #3828 2020-08-24 13:19:12 +05:30
mohd asif 184d949f40 initial commit 2020-08-24 13:14:22 +05:30
gusaindeepak54 44ec9411b9 Fix Filter Problem 2020-08-24 10:48:00 +05:30
Glenn Hermans 2c9a62c942
fixed #3822 2020-08-24 00:28:45 +02:00
Devansh 53873d854c Recompiled 2020-08-21 20:25:30 +05:30
Devansh 832472b787
Merge branch 'master' into ipad_responsive_issue 2020-08-21 18:45:03 +05:30
Jitendra Singh 8e0a30056c
Merge pull request #3808 from vishal-webkul/issue-3791
Issue #3791 fixed
2020-08-21 18:22:38 +05:30
Jitendra Singh 6a7269b888
Merge pull request #3823 from devansh-webkul/redirect_and_notification_issue
Fixed "error!options are missing alert" on home page shouldn't be shown #3231
2020-08-21 18:22:22 +05:30
Devansh 18dd63f967 Removed Inline Property And Added To CSS 2020-08-21 17:55:57 +05:30
Devansh 36d3719374 Overflow And Some Styles Addded 2020-08-21 17:39:50 +05:30
Akhtar Khan d3e1057cb5 recently view product issue solved 2020-08-21 17:31:44 +05:30
Devansh 90fa8eb1d4 Warning Added 2020-08-21 15:59:31 +05:30
Devansh ae438e9306 Fixed Width On SmallScreen 2020-08-21 15:04:00 +05:30
rahulshukla-home 49fb3041bc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-08-21 14:57:51 +05:30
Jitendra Singh 385b693048
Merge pull request #3138 from Haendlerbund/check-if-item-in-cart-is-deactivated
add function to remove inactive products from cart
2020-08-21 14:37:16 +05:30
Steffen Mahler 089f454f30 fix bug in cart item validation result 2020-08-21 10:49:01 +02:00
rahulshukla-home 78a22be77d Issue #3819 fixed 2020-08-21 13:51:38 +05:30
Jitendra Singh 7c16341283
Merge pull request #3805 from deepaksinghgusain227/fix-header-content-count-field-problem
Fix Header Content Count field Problem #3800
2020-08-21 12:44:39 +05:30
Devansh 7815a9fae3 Issue Fixed #3231 2020-08-21 11:07:41 +05:30
Jitendra Singh 4799013fd7
Merge pull request #3814 from Haendlerbund/expand-some-api-responses
minor expansion of api return data
2020-08-20 21:40:18 +05:30
Jitendra Singh 3105347151
Merge pull request #3795 from akhtarkhan1/image-name-alignment
issue fixed #3783
2020-08-20 21:34:12 +05:30
Akhtar Khan 2a4218bfa1 final 2020-08-20 20:44:24 +05:30
Akhtar Khan b39487beae issue #3799 2020-08-20 20:34:36 +05:30
Jitendra Singh da62fd7583
Merge pull request #3809 from deepaksinghgusain227/fix-product-channel-problem
Update Product channel problem #3785
2020-08-20 20:02:55 +05:30
Jitendra Singh 58725a40d8
Merge pull request #3815 from Haendlerbund/expand-wysiwyg-editor-for-cms-pages
Expand wysiwyg editor for cms pages
2020-08-20 20:02:39 +05:30
Devansh 6182d8fb6f Layout Issue Fixed 2020-08-20 19:52:34 +05:30
vishal.kushwaha650 6c709b68a3 Issue #3811 fixed 2020-08-20 19:46:49 +05:30
Akhtar Khan 1a302657ef solved 2020-08-20 18:38:49 +05:30
gusaindeepak54 f5e333f143 add space btw 'all'){ 2020-08-20 17:43:23 +05:30
Annika Wolff 879b76522a add tables, lists and links to wysiwyg editor 2020-08-20 13:45:44 +02:00
Annika Wolff 7de4c7ff00 minor expansion of api return data 2020-08-20 13:31:35 +02:00
Akhtar Khan c548b64578 remove compare file from PR 2020-08-20 16:24:00 +05:30
Akhtar Khan 24603b6cac final fixed 2020-08-20 16:20:50 +05:30
Akhtar Khan 3b45aa7776 final fixed 2020-08-20 16:18:37 +05:30
Devansh 79b34eed8f Responsive Issue Fix 2020-08-20 15:58:18 +05:30
vishal.kushwaha650 2c8d1b5926 Issue #3792 fixed 2020-08-20 15:50:42 +05:30
Akhtar Khan b97eb38994 Merge branch 'master' of https://github.com/bagisto/bagisto into linked-product-admin 2020-08-20 15:17:33 +05:30
gusaindeepak54 2bfbde966f Update Product channel problem 2020-08-20 14:47:20 +05:30
Steffen Mahler 5e651c677e fix forgotten conflicts, fix use statements 2020-08-20 09:48:11 +02:00
Steffen Mahler 1b5c3bca93 resolve conflicts 2020-08-20 09:28:33 +02:00
vishal.kushwaha650 421b2028f0 Issue #3791 fixed 2020-08-20 12:46:43 +05:30
gusaindeepak54 47b0dc30c9 Update Fields of Meta data Info 2020-08-20 12:05:30 +05:30
Akhtar Khan 1ee0202a82 add mt-0 class in h3 2020-08-20 11:48:08 +05:30
Akhtar Khan ebeb32e265 added classs 2020-08-20 11:35:22 +05:30
gusaindeepak54 ad913bfaef Fix Header Content Count field Problem with Validation 2020-08-20 11:27:46 +05:30
gusaindeepak54 abcf7574eb Fix Header Content Count field Problem 2020-08-20 10:36:42 +05:30
vishal.kushwaha650 e500456ff6 Issue #3786 fixed 2020-08-19 19:40:13 +05:30
gusaindeepak54 d1236a681d Fix Newsletter Subscription Problem 2020-08-19 19:17:55 +05:30
vishal.kushwaha650 a11a308710 add fadein effect on open quick product view 2020-08-19 18:08:51 +05:30
Shubham Mehrotra c083775fa1 velocity meta content channel issue resolved 2020-08-19 16:59:37 +05:30
Akhtar Khan ce1b92370e fixed 2020-08-19 16:45:11 +05:30
Akhtar Khan 54d10be491 issue fixed #3783 2020-08-19 16:40:59 +05:30
Akhtar Khan 484728f5bc issue #3781 2020-08-19 15:57:47 +05:30
Akhtar Khan 9bfd5f3033 removed other changes 2020-08-19 15:35:51 +05:30
Akhtar Khan 7a03309de5 issue fixed #3781 2020-08-18 20:26:59 +05:30
Akhtar Khan 398b924aae fixed some changes 2020-08-18 18:54:55 +05:30