Commit Graph

1430 Commits

Author SHA1 Message Date
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
Devansh f05b17aa99 Enahancement Done 2020-08-01 15:07:51 +05:30
vishal-webkul b4cb34f971 issue #3606 fixed 2020-08-01 14:10:16 +05:30
Devansh 5a25eb14e1 Cancelled Order Mail Issue Fixed 2020-08-01 11:11:52 +05:30
Akhtar Khan e587fe2448 Fixed issue 2020-07-29 19:37:02 +05:30
Akhtar Khan abfac60381
Merge branch 'master' into patch4 2020-07-29 09:50:05 +05:30
Akhtar Khan 906496b7b1 Space issue fixed 2020-07-27 16:08:48 +05:30
Akhtar Khan e7125d9a57
Update view.blade.php 2020-07-24 19:50:28 +05:30
Akhtar Khan 4e6d49ac83
Update app.scss
add spacing
2020-07-24 19:35:49 +05:30
Akhtar Khan af34c809a0 Merge branch 'master' of https://github.com/bagisto/bagisto into locale_broken_image 2020-07-24 18:55:35 +05:30
Akhtar Khan e6d21c64d5 fixed 2020-07-24 13:09:03 +05:30
Akhtar Khan fa8c8a52ab fixed final 2020-07-24 13:03:10 +05:30
Akhtar Khan a58b895127 fixed layout 2020-07-24 12:36:05 +05:30
Akhtar Khan 398fa8032c RTL cancel button in order section #3521 2020-07-23 16:05:36 +05:30
Steffen Mahler 6f76bb4a97 merge bagisto/master into check-if-item-in-cart-is-deactivated 2020-07-22 09:34:45 +02:00
Akhtar Khan 0da8d86904 Fixed layout issue in order information in default theme at customer end #3521 2020-07-21 13:09:28 +05:30
shivam kumar e8983f308d issue #3514 resolved 2020-07-17 15:53:35 +05:30
rahulshukla-home 41fbb0adab Issue #3505 fixed 2020-07-17 14:31:51 +05:30
Akhtar Khan f114ba2dcb Fixed layout issue in order and downloadable grid at customer #3472 2020-07-16 17:51:32 +05:30
Akhtar Khan 8c1561c142 Merge branch 'master' of https://github.com/bagisto/bagisto into patch3 2020-07-16 12:41:34 +05:30
Akhtar Khan 9b82845bb6 changes in compare file 2020-07-16 12:41:11 +05:30
mohd asif 822b86e126 fixed issue 3311 in default theme 2020-07-16 12:16:13 +05:30
Steffen Mahler 2b4615b9c0 resolve conflict in CartRule.php 2020-07-15 08:44:56 +02:00
Jitendra Singh ac04d9418f
Merge pull request #3432 from asif-webkul/newissue
fixed issue #3400 and #3399
2020-07-14 19:16:01 +05:30
Steffen Mahler 92970b4bd4 resolve conflict in Bundle.php 2020-07-14 13:36:15 +02:00