Commit Graph

1554 Commits

Author SHA1 Message Date
devansh bawari b6c9dc1b98 Text Message Added 2020-11-23 18:32:37 +05:30
rahulshukla-home 4ad221ec05 mobile view issue 2020-11-23 15:42:50 +05:30
rahulshukla-home 2c9b131fd3 Enhancement #4250 done for default theme 2020-11-19 15:23:51 +05:30
devansh bawari b688aaf321 Formatted Price According To Translation 2020-11-16 20:42:37 +05:30
devansh bawari 8bd986e637 Translation Updated 2020-11-16 20:42:03 +05:30
devansh bawari 8e6db8509d Changes Done According To Method 2020-11-16 20:26:49 +05:30
devansh bawari 43e6f363d5 Equal Sign Added 2020-11-16 18:26:05 +05:30
Jitendra Singh d96fdaf074
Merge pull request #4249 from devansh-webkul/issue-4029
Completed feature request to have a minimum order amount #4029
2020-11-12 15:02:31 +05:30
devansh bawari 03e0c7ad30 Parsing Issue Fixed 2020-11-11 16:19:54 +05:30
devansh bawari 18322873aa Removed From One Page 2020-11-10 13:06:40 +05:30
devansh bawari d054bf8242 Reverted Two Files 2020-11-10 12:40:36 +05:30
devansh bawari 5f75fa7fb2 Component Added For Both Themes 2020-11-10 12:08:46 +05:30
vishal.kushwaha650 24db2e81d4 remove wrong if condition 2020-11-10 11:55:37 +05:30
vishal.kushwaha650 d668f6de16 Same image warning issue resolved 2020-11-10 11:39:06 +05:30
devansh bawari 9eb317402e Component Added For Default Theme 2020-11-10 11:37:03 +05:30
vishal.kushwaha650 445c912217 Add Translation and implement in default theme 2020-11-10 10:45:49 +05:30
devansh bawari d27bbd7027 Added For Default Theme As Well 2020-11-09 19:44:41 +05:30
devansh bawari 19e04369f6 Dummy Translation Added 2020-11-09 18:38:18 +05:30
devansh bawari e47662e6a5 Warning Message Added In Place Order As Well 2020-11-09 18:23:47 +05:30
devansh bawari a3a858a459 Minimum Order Check Added To Cart 2020-11-09 16:53:32 +05:30
vishal.kushwaha650 7c15850520 Issue #4228 Fixed 2020-11-09 10:22:57 +05:30
devansh bawari 383edab8b5 Duplicated Images Removed 2020-11-02 11:59:21 +05:30
Glenn Hermans 6be2c6e22d
Merge pull request #4202 from devansh-webkul/issue-4105
Fixed issue with total due in cash on delivery #4105
2020-10-30 12:00:01 +01:00
devansh bawari 906002c945 Case Added For Amount Due 2020-10-29 11:35:58 +05:30
naresh-webkul 7d030469f1
Merge branch 'master' into 4136 2020-10-28 18:54:08 +05:30
Jitendra Singh c2480ef1f0
Merge pull request #4185 from howdu/master
Fix error with missing locale and error with route:list
2020-10-28 18:34:50 +05:30
naresh verma 8e8207f68a fixed issue #4136 2020-10-28 13:49:47 +05:30
howdu c7e0a9723e Fix error with misisng locale
Fixed this error and searhc for other files with same code.

Trying to get property 'direction' of non-object (View: /packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php)
2020-10-27 07:56:41 +00:00
unknown b168681ad7 Merge branch 'master' of https://github.com/bagisto/bagisto into master 2020-10-23 19:23:13 +05:30
unknown 1149483c3d admin locale issue fixed 2020-10-23 19:21:04 +05:30
devansh bawari a4125a7907 Bug Fixed In Default Theme 2020-10-23 11:23:23 +05:30
Jaseel P V 4060fdebd2 Fixed console error in default product page 2020-10-22 20:04:49 +05:30
mohd asif b8ef29a922 fixed issue #4121 2020-10-21 15:32:10 +05:30
devansh bawari e0563b9d17 Explicit Width And Height Added For Light House 2020-10-20 14:56:48 +05:30
devansh bawari 0cea670a06 Fixed RTL Issue 2020-10-16 11:50:05 +05:30
Jitendra Singh 4f988d107b
Merge pull request #4076 from vishal-webkul/issue-4035-2
Issue #4035 Fixed in Default Theme
2020-10-15 11:31:54 +05:30
vishal.kushwaha650 fb78211662 fix booking product view 2020-10-14 10:51:55 +05:30
Jitendra Singh d0740a5f9d
Merge pull request #4066 from jaseelbavu/issue-3938
Added configuration to enable/disable image search feature
2020-10-13 15:43:41 +05:30
vishal.kushwaha650 1d43eb00a6 Issue #4035 Fixed 2020-10-13 11:29:38 +05:30
gusaindeepak54 65d215ee16 add image_search varibale 2020-10-12 16:50:55 +05:30
gusaindeepak54 0c76d3c474 Resolve Search Bar Issue 2020-10-12 16:16:51 +05:30
Jaseel P V bcfcdf0368 Added configuration to enable/disable image search feature 2020-10-10 19:45:51 +05:30
vishal.kushwaha650 8cf7b2aaa6 Issue #4045 Fixed 2020-10-09 14:01:49 +05:30
Jitendra Singh 76f2ec6c8a
Merge pull request #4017 from vishal-webkul/issue3950
Issue 3950 Fixed
2020-10-08 15:39:20 +05:30
Jitendra Singh e4d5b7021e
Merge pull request #4025 from jaseelbavu/master
Fixed issue in image slider path
2020-10-08 13:58:24 +05:30
vishal.kushwaha650 6afb1ffa44 Issue #4030 Fixed 2020-10-08 12:48:09 +05:30
Jaseel P V 1ce3d26d25 Fixed issue in image slider path (Path adding to url instead of redirecting issue) #3987 2020-10-07 22:20:15 +05:30
vishal.kushwaha650 6ad00c4634 Issue #3950 fixed 2020-10-07 11:40:52 +05:30
Jaseel P V e3fb1561f3 Conflict cleared 2020-10-06 22:44:42 +05:30
Jitendra Singh ecc87fb72f
Merge pull request #4004 from jitendra-webkul/master
Improved lighthouse score for default theme
2020-10-06 21:01:32 +05:30
jitendra 7a81aacd37 Added loader after paypal button success payment 2020-10-06 19:22:05 +05:30
JunaidJaved8461 59c92b2bfd
View.blade.php updated
Syntax updated only for product description
2020-10-06 18:16:13 +05:00
JunaidJaved8461 08b968ec26
Issue Fixed #3945
Showing some html code while sharing product on facebook #3945 is fixed now
2020-10-06 16:35:15 +05:00
JunaidJaved8461 4959fde5ed
Issue Fixed #3945
Showing some html code while sharing product on Facebook Issue is fixed now
2020-10-06 16:30:04 +05:00
jitendra 77655fd95d Improved lighthouse score for default theme 2020-10-05 17:13:36 +05:30
Glenn Hermans c62fe7a78d
fix #3391 2020-10-05 10:57:49 +02:00
Jitendra Singh 2af211a287
Merge pull request #3947 from deepaksinghgusain227/add-new-featured-product
Add new and featured Product Config
2020-09-23 17:25:46 +05:30
jitendra 8b23fa74ab Added paypal smart payment button method 2020-09-23 16:40:21 +05:30
gusaindeepak54 7eff946013 Update Shop Theme 2020-09-18 16:25:17 +05:30
Devansh 60e8c8b3df Some Minor Changes Done 2020-09-08 00:09:48 +05:30
Devansh 9dae408c03 Some Changes done 2020-09-07 23:09:19 +05:30
Devansh cb2194f4cd Payment Instructions Added On Invoice 2020-09-07 22:17:37 +05:30
vishal.kushwaha650 b630f107d2 Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-3900 2020-09-07 19:49:05 +05:30
Jitendra Singh 0096491a4d
Merge pull request #3868 from devansh-webkul/compare_icon_issue_in_default
Fixed #3866
2020-09-07 19:36:38 +05:30
Devansh 8099c3cb74 Instructions Added 2020-09-07 18:09:39 +05:30
vishal.kushwaha650 4ffce40f1e fixed sale sticker problem 2020-09-07 15:40:54 +05:30
vishal.kushwaha650 71ae924806 Issue #3900 fixed 2020-09-05 21:02:32 +05:30
Devansh 896388bb75
Merge branch 'master' into compare_icon_issue_in_default 2020-09-05 12:21:31 +05:30
Devansh 377283237c https://github.com/bagisto/bagisto/pull/3868#issuecomment-686963796 Fixed 2020-09-05 12:19:38 +05:30
Jitendra Singh 6aa8e11a3c
Merge pull request #3876 from devansh-webkul/back_url_issue
Fixed #3872
2020-09-04 11:43:11 +05:30
Devansh 4d40444dd2 RTL Issue Fixed In Default 2020-09-03 23:50:08 +05:30
Jitendra Singh 4a72c72b24
Merge pull request #3880 from jitendra-webkul/master
Config to add custom css and javascript (Eg. google anlytics)
2020-09-03 19:41:55 +05:30
jitendra 4b6bb0a8f5 Config to add custom css and javascript (Eg. google anlytics) 2020-09-03 19:24:15 +05:30
Devansh 3b14f6d334 Layout Issue Fixed 2020-09-03 18:35:20 +05:30
Devansh ebd604dafc Merge branch 'master' into compare_icon_issue_in_default
Merged With Master
2020-09-03 16:53:02 +05:30
Devansh 72f09ecfc5 Added Back Routes 2020-09-03 15:09:14 +05:30
Devansh ef19d5c58b Replaced Back URL With Profile URL 2020-09-03 15:02:59 +05:30
Devansh 6694acd412 Added Previous URL Route To File 2020-09-03 14:39:24 +05:30
Devansh bc8ab08f47 Reverted Changes to This Commit 21bf977 2020-09-03 13:52:04 +05:30
Devansh 606e6b1d4b Added Yielding For Custom CSS 2020-09-03 13:16:31 +05:30
Devansh 93bc55f507 Inline CSS Removed 2020-09-03 12:15:16 +05:30
Devansh 4420374bd8 Compare Icon Issue Fixed 2020-09-02 21:04:21 +05:30
Devansh 21bf97719e Added : Back 2020-09-02 19:04:47 +05:30
Devansh f6094287c1 Minor CSS Changed 2020-09-02 18:38:04 +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
Devansh 576b878998 Some Minor Encoding Issue Fixed 2020-08-31 15:06:07 +05:30
Devansh 78a8a95b26 Encoding Adjusted 2020-08-28 21:26:18 +05:30
Devansh ce9dba5ff7 Some Adjustment Done 2020-08-28 01:33:24 +05:30
Devansh 3a35028dfc Invoice Added In Center 2020-08-28 00:41:37 +05:30
Devansh cc425ad13a Two Seperate Form Merged 2020-08-28 00:09:28 +05:30
Devansh 64c80783f8 Added To Default And Velocity Customer 2020-08-26 18:33:22 +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 90fa8eb1d4 Warning Added 2020-08-21 15:59:31 +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 1b5c3bca93 resolve conflicts 2020-08-20 09:28:33 +02:00
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
Akhtar Khan 54d10be491 issue fixed #3783 2020-08-19 16:40:59 +05:30
Akhtar Khan 9bfd5f3033 removed other changes 2020-08-19 15:35:51 +05:30
Akhtar Khan 0e563fcc20 Fixed issue #3772 2020-08-18 18:02:01 +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
vishal.kushwaha650 45ab987360 issue #3740 fixed 2020-08-13 11:46:58 +05:30
Devansh c319540491 Merge branch 'master' into downloadable_product_issue
Master Merged
2020-08-12 15:17:50 +05:30
Shubham Mehrotra 8ed48f41f2 #3725 2020-08-12 10:48:02 +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
Devansh 61f0e0f296
Merge branch 'master' into adding_missing_translation 2020-08-11 17:38:49 +05:30
Jitendra Singh aaf0d5c962
Merge pull request #3719 from rahulcs0082/development
Issue #3717 fixed
2020-08-11 16:58:54 +05:30
Devansh 43eb5b7f83 Added Invoice State Check 2020-08-11 12:29:19 +05:30
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
Devansh 104ba6ce1f Invoice State Added To The Query 2020-08-10 22:28:23 +05:30
Shubham Mehrotra 17a5e453f5 updates 2020-08-10 22:20:46 +05:30
Shubham Mehrotra e40afeaf90 update 2020-08-10 21:43:31 +05:30
Shubham Mehrotra 78d015f41f compare feature update 2020-08-10 21:24:59 +05:30
Akhtar Khan 76cadf49ca changed files #3688 2020-08-10 21:13:09 +05:30
Akhtar Khan 0289094a7f changed files #3688 2020-08-10 21:08:56 +05:30
Akhtar Khan 48a39ff498 Merge branch 'master' of https://github.com/bagisto/bagisto into select_icon_payment_page 2020-08-10 21:00:31 +05:30
Akhtar Khan 3a365a1869 final changed #3688 2020-08-10 20:57:44 +05:30
Akhtar Khan 44a68c8dbb issued fixed #3688 2020-08-10 20:14:18 +05:30
Annika Wolff 58269996b2
Merge branch 'master' into check-if-item-in-cart-is-deactivated 2020-08-10 16:11:39 +02:00
Devansh d7fc4aa233
Merge branch 'master' into adding_missing_translation 2020-08-10 19:38:48 +05:30
Akhtar Khan 32ca7b548b removed white spaces 2020-08-10 18:35:15 +05:30
rahulshukla-home 5663afec6a Issue #3494 fixed 2020-08-10 18:14:38 +05:30
Akhtar Khan 99c6d0a6d4 issue fixed 3688 2020-08-10 18:01:38 +05:30
Devansh 3b5764034a Language Translation Copied From Velocity To Shop 2020-08-08 12:49:23 +05:30
Devansh 7a3fd15b11 From Shop Velocity Lang Dependencies Removed And Added That Language Translation To Shop Lang 2020-08-08 12:48:02 +05:30
Steffen Mahler c9f7c70d52 resolve conflicts 2020-08-06 15:23:32 +02:00
Devansh 0c748b6563
Merge branch 'master' into tooltip_placement 2020-08-06 12:53:06 +05:30
Jitendra Singh 45b3a61591
Merge pull request #3664 from devansh-webkul/compare_notification_issue
Fixed no message on removing products or deleting all from compare list in default theme #3505
2020-08-06 12:46:49 +05:30
Devansh d74e6e9cbc Notification Added For All Items 2020-08-05 19:59:54 +05:30
Devansh fbe5a9cc9b Compare Product Issue Fixed 2020-08-05 17:03:10 +05:30
Devansh f556ab26e6
Merge branch 'master' into tooltip_placement 2020-08-05 16:57:19 +05:30
Jitendra Singh 2d2275f306
Merge pull request #3625 from vishal-webkul/issue-3606
Issue #3606 fixed
2020-08-05 15:32:15 +05:30
Jitendra Singh 9e9066f28a
Merge pull request #3607 from devansh-webkul/unable_to_download_files_while_comparing_products
Fixed unable to download files while comparing products #3501
2020-08-05 13:17:43 +05:30
Devansh 3cb5e5aee9
Merge branch 'master' into tooltip_placement 2020-08-05 13:08:15 +05:30
Devansh 927bc2105c Translation Added To Default Theme 2020-08-05 13:04:36 +05:30
Devansh 8cc838e696 Tooltip Added On Default Theme 2020-08-05 12:37:15 +05:30
Jitendra Singh 07a9d8588a
Merge pull request #3608 from devansh-webkul/inactive_child_product_isssue
Fixed inactive child product shouldn't visible in grouped product #3575
2020-08-05 11:07:00 +05:30
Devansh ece0f9ed60 Added In Default Theme 2020-08-04 20:42:38 +05:30
Devansh 67ddf6020e Added In Default Theme As Well 2020-08-04 20:29:19 +05:30
Jitendra Singh 72ce4eea7e
Merge pull request #3619 from devansh-webkul/mail_issue_on_cancel_order
Fixed admin is not getting mail when customer cancels order #3522
2020-08-04 17:26:32 +05:30
Devansh c22bdf45ca Template Fixed 2020-08-04 17:12:48 +05:30
Jitendra Singh 284fa3f406
Merge pull request #3626 from devansh-webkul/mail_are_not_sent_on_change_password
Completed Enhancement on changing current password admin/customer should get mail #3526
2020-08-04 11:01:34 +05:30
vishal-webkul 27a2fd5c06 add blank stars in bliss theme star rating 2020-08-01 19:24:02 +05:30
Devansh 6c48756792 Removed Array From IT Locale File As It Is Already Present Their 2020-08-01 17:08:46 +05:30
Devansh 385eeb2d7e Order ID Added To Subject 2020-08-01 17:03:05 +05:30
Devansh d7e9c8b86d Some correction done in the message 2020-08-01 15:37:20 +05:30