Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎯 fix: POS discount coupons were accessible from single order page on admin dashboard #159

Conversation

devAsadNur
Copy link
Member

@devAsadNur devAsadNur commented Oct 1, 2024

Summary by CodeRabbit

  • New Features

    • Enhanced product display with options for grid and list views.
    • Introduced a modal for displaying payment receipts and help information.
    • Improved cart management, allowing direct editing of item quantities and a more robust coupon system.
    • Added functionality for managing product categories effectively.
  • Bug Fixes

    • Refined payment processing logic to ensure correct gateway selection and validation of payment conditions.
  • Chores

    • Updated discount coupon handling in the admin panel for better management of POS orders.

@devAsadNur devAsadNur self-assigned this Oct 1, 2024
Copy link

coderabbitai bot commented Oct 1, 2024

Walkthrough

The changes involve enhancements to the Home.vue component for improved product display and cart management, including new methods for handling categories and payment processing. Additionally, the Discounts class in the includes/Admin/Discounts.php file has been updated to manage discount coupon URLs more effectively, particularly for POS orders. These updates aim to streamline user interactions and improve functionality within the application.

Changes

File Change Summary
assets/src/frontend/components/Home.vue Enhanced product display and cart management; added methods for category handling and payment processing.
includes/Admin/Discounts.php Added method to modify coupon URLs for POS orders; maintained existing discount coupon functionalities.

Assessment against linked issues

Objective Addressed Explanation
Automatically generated coupons are not removed and still can be seen from the admin dashboard. (#157)

🐰 In the land of code, we hop with glee,
New features sprout like leaves on a tree.
Coupons now vanish, no trace to be found,
In the cart, sweet items dance all around.
With a click and a twirl, the payments flow,
Hooray for the changes, let the good times grow! 🌟


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@devAsadNur devAsadNur added Needs Dev Review This PR needs review by a developer Needs Testing This requires further testing labels Oct 1, 2024
@devAsadNur devAsadNur requested a review from mrabbani October 1, 2024 05:45
@devAsadNur devAsadNur changed the title fix: POS discount coupons were accessible from single order page on admin dashboard 🎯 fix: POS discount coupons were accessible from single order page on admin dashboard Oct 1, 2024
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
includes/Admin/Discounts.php (1)

148-156: LGTM: New method effectively prevents access to POS discount coupons.

The remove_discount_coupon_url method successfully addresses the PR objective by replacing the coupon URL with '#' for POS orders. This prevents access to the coupon editing screen for automatically generated coupons used in POS transactions.

Consider a minor refactoring for improved readability:

 public function remove_discount_coupon_url( $url, $item, $order ) {
-    if ( ! $order->get_meta( '_wepos_is_pos_order' ) ) {
-        return $url;
-    }
-
-    $url = '#';
-
-    return $url;
+    return $order->get_meta( '_wepos_is_pos_order' ) ? '#' : $url;
 }

This change maintains the same functionality while making the code more concise.

assets/src/frontend/components/Home.vue (1)

909-910: Remove Unnecessary Empty Lines

There are unnecessary empty lines at the end of the processPayment() method. Removing them can help keep the code clean and maintain consistent formatting.

Apply this diff to remove the extra lines:

-    909~
-    910~
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 32aa76e and 5be8aae.

📒 Files selected for processing (2)
  • assets/src/frontend/components/Home.vue (2 hunks)
  • includes/Admin/Discounts.php (2 hunks)
🔇 Additional comments (3)
includes/Admin/Discounts.php (2)

37-37: LGTM: Constructor change aligns with PR objective.

The addition of the woocommerce_admin_order_item_coupon_url filter in the constructor is appropriate. It hooks the remove_discount_coupon_url method, which will help prevent access to automatically generated coupons in the admin dashboard, aligning with the PR's objective.


Line range hint 1-156: Summary: Changes effectively address the PR objective.

The modifications to the Discounts class successfully implement the required functionality to prevent access to automatically generated coupons for POS orders in the admin dashboard. The new remove_discount_coupon_url method, coupled with the added filter in the constructor, provides a clean and effective solution to the issue described in the PR.

The implementation is well-structured, follows good coding practices, and integrates seamlessly with the existing codebase. These changes should resolve the problem of POS discount coupons being accessible from the single order page on the admin dashboard.

assets/src/frontend/components/Home.vue (1)

892-892: 🛠️ Refactor suggestion

Refactor Suggestion: Consolidate $contentWrap.unblock(); to Reduce Duplication

The $contentWrap.unblock(); function is called in both the if and else blocks of the .done() handler, leading to duplicate code. Consider moving $contentWrap.unblock(); outside the if-else block to ensure it executes regardless of the condition. This enhances readability and maintainability.

Apply this diff to refactor the code:

wepos.api.post( wepos.rest.root + wepos.rest.posversion + '/payment/process', response )
    .done( data => {
        if ( data.result == 'success' ) {
            this.$router.push({
                name: 'Home',
                query: {
                    order_key: response.order_key,
                    payment: 'success'
                }
            });
        } else {
            // Handle non-success case if necessary
        }
+       $contentWrap.unblock();
    })
    .fail( data => {
        $contentWrap.unblock();
        alert( data.responseJSON.message );
    });

Likely invalid or redundant comment.

@shashwatahalder01 shashwatahalder01 added QA In Progress QA Approved This PR is approved by the QA team and removed Needs Testing This requires further testing QA In Progress labels Jan 10, 2025
@mrabbani mrabbani added Dev Review Done and removed Needs Dev Review This PR needs review by a developer labels Jan 10, 2025
@devAsadNur devAsadNur merged commit 9be7adb into getdokan:develop Jan 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dev Review Done QA Approved This PR is approved by the QA team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Automatically generated coupons are not remove and still can be seen from the admin dashboard.
3 participants