Db merge

[nsavinda]

Summary by CodeRabbit

• New Features

  • Added a "Today" button for filtering orders in the rental orders view.
  • Enhanced date selection validation in the customer rent view, including alert messages for missing dates.
  • Added functionality to close modals by clicking outside the modal content in jQuery scripts.

• Bug Fixes

  • Adjusted button visibility and functionality based on order status and start date in rental order list views.
  • Corrected margin-left values in SCSS for better alignment.

• Removed Features

  • Removed the method for fetching rent complaints due to changes in requirements.

• Style

  • Updated button styles and interaction cues across various views for consistency and better user experience.

• Chores

  • Commented out unused code blocks that affect cart total calculations and button functionalities to streamline operations.

[coderabbitai]

Walkthrough

The recent modifications across various PHP, SCSS, and JavaScript files focus on enhancing user experience and interface efficiency. Changes include disabling certain UI elements, adding new functionalities like modal click behaviors, and refining the visual layout. Notably, some backend logic, particularly in cart and complaint handling, has been adjusted or removed, streamlining operations and potentially altering data flow.

Changes

File Path	Change Summary
.../controllers/Cart.php	Commented out code block for cart item total calculation.
.../models/RentComplaint.php	Removed getComplaints method.
.../views/customer/.../orderlist.view.php .../views/customer/rent.view.php	Commented out order-related button; added date validation in rent view.
.../views/rental/.../orderlist.view.php .../views/rental/orders.view.php	Adjusted button display logic based on order status and date; added "Today" button and global variable for order status.
public/assets/js/jqueryScript.js	Added modal background click functionality.
public/assets/scss/.../_margin.scss	Adjusted margin-left values and formatting.

🐰✨
A hop, a skip, a code deploy,
Changes abound, oh what a joy!
Clicks on modals, margins align,
Each line of code, refined like wine.
Celebrate the tweaks, big and small,
Here's to progress, cheers to all! 🥂
🌟🐇

`

• <!-- <button class="btn btn-primary flex-d" id="mark-as-rented"> => <!-- <button class="btn-text-green " id="mark-as-rented"><i class="fa fa-check" aria-hidden="true"></i>Mark as Rented
• <?php } } => <?php }

---

app/views/rental/orders.view.php: ## Short Summary

• Added a new button "Today" in the UI for filtering orders.
• Introduced a global variable window.orderStatus to store the current order status.
• Modified the logic to update order status and trigger order retrieval after certain actions.
• Commented out code related to changing button styles and disabling buttons.

---

public/assets/js/jqueryScript.js: ## Short Summary
Added functionality to handle clicks on the modal background to close the modal if the click is outside the modal content.

---

public/assets/scss/wl/dashboard/common/_margin.scss: ## Short Summary
The change in functionality involves correcting the spacing in the SCSS file _margin.scss, specifically adjusting the margin-left values for classes .ml-8 and .ml-7, and fixing the formatting at the end of the file.

Alterations to the Declarations of Exported or Public Entities

• .ml-8 in .scss file => margin-left: 9rem !important;
• .ml-7 in .scss file => margin-left: 8rem !important;
• Added extra newline at the end of the file.

-->
<!-- end of auto-generated comment: raw summary by coderabbit.ai --><!-- This is an auto-generated comment: short summary by coderabbit.ai -->
<!--


## PR Objectives

The pull request titled "Db merge" with number 248 encompasses a series of modifications across various components of a web application, including controllers, models, views, JavaScript, and SCSS files. The changes aim to adjust functionalities, enhance user experience, and refine the UI's visual and operational aspects. Although the specific objectives of the PR are not detailed in the provided information, the nature of the changes suggests a focus on improving the application's handling of cart operations, rental order management, and user interface adjustments.

## AI-generated Summary of Generated Summaries

This pull request introduces several key changes across different parts of the application:

1. **Cart Functionality Adjustments:**
   - In `Cart.php`, a block of code responsible for calculating the total cost of items in the cart has been commented out. This alteration might affect the cart's functionality by potentially bypassing the total calculation before the cart is displayed.

2. **Model and Data Handling Changes:**
   - The `RentComplaint.php` model has seen the removal of the `getComplaints` method, which previously accepted an array to filter complaints based on specified criteria. This change could impact how complaints are retrieved and handled within the application.

3. **User Interface and Experience Enhancements:**
   - Several changes have been made to improve the user interface and experience:
     - In `orderlist.view.php`, a button for marking an order as rented has been commented out, affecting its display but not its functionality.
     - The `rent.view.php` file now includes validation to ensure a date is selected before proceeding, enhancing user interaction by preventing errors early in the process.
     - Adjustments in `rental/components/orderlist.view.php` modify the conditions under which certain buttons are displayed, depending on the order status and start date. This change ensures that actions such as marking an order as rented or returned are only available when appropriate.
     - A new "Today" button has been added in `orders.view.php` to facilitate the filtering of orders by today's date, alongside modifications to how order statuses are handled and displayed.

4. **JavaScript and Styling Modifications:**
   - The `jqueryScript.js` file now includes functionality to close modals by clicking outside the modal content, improving the user interface by allowing more intuitive interaction with modal dialogs.
   - In the SCSS file `_margin.scss`, corrections have been made to the margin-left values for specific classes, ensuring consistent spacing and alignment across the application's components.

These changes collectively aim to refine the application's functionality, data handling, and user interface, making it more robust, user-friendly, and visually consistent.

## Alterations to the Declarations of Exported or Public Entities

- **app/controllers/Cart.php:**
  - Before: `public function viewCart(string $a, string $b, string $c): void`
  - After: `public function viewCart(string $a = '', string $b = '', string $c = ''): void`

- **app/models/RentComplaint.php:**
  - Removed: `public function getComplaints(array $data)`

- **app/views/rental/components/orderlist.view.php:**
  - Changes in button conditions and styles:
    - Before: `if ($order->status == 'accepted') {`
    - After: `if ($order->start_date <= date('Y-m-d') && $order->status == 'accepted') {`
    - Before: `<button class="btn btn-primary flex-d btn-danger" id="mark-as-rented" disabled>`
    - After: `<button class="btn-text-orange " id="mark-as-rented" >`
    - Before: `<button class="btn-text-red" id="cancel-rented" >Cancel</button>`
    - After: `<!-- <button class="btn-text-red" id="cancel-rented" >Cancel</button> -->`
    - Before: `<button class="btn btn-primary flex-d" id="mark-as-rented">`
    - After: `<!-- <button class="btn-text-green " id="mark-as-rented"><i class="fa fa-check" aria-hidden="true"></i>Mark as Rented`

- **public/assets/scss/wl/dashboard/common/_margin.scss:**
  - Changes in margin values:
    - Before: `.ml-8 { margin-left: 8rem !important; }`
    - After: `.ml-8 { margin-left: 9rem !important; }`
    - Before: `.ml-7 { margin-left: 7rem !important; }`
    - After: `.ml-7 { margin-left: 8rem !important; }`

-->
<!-- end of auto-generated comment: short summary by coderabbit.ai -->

---

<details>

<summary>Recent Review Details</summary>

**Configuration used: CodeRabbit UI**
**Review profile: CHILL**

<details>
<summary>Commits</summary>
Files that changed from the base of the PR and between fd47ab0f5b482157408112dc3da5d420f771ba9a and 6e7518de3b00241b59beba42c7dad9036518949b.
</details>


<details>
<summary>Files selected for processing (2)</summary>

* app/models/RentComplaint.php (1 hunks)
* public/assets/scss/wl/dashboard/common/_margin.scss (1 hunks)

</details>





<details>
<summary>Files skipped from review as they are similar to previous changes (2)</summary>

* app/models/RentComplaint.php
* public/assets/scss/wl/dashboard/common/_margin.scss

</details>





</details><!-- commit_ids_reviewed_start -->

<!-- fd47ab0f5b482157408112dc3da5d420f771ba9a -->
<!-- 6e7518de3b00241b59beba42c7dad9036518949b -->

<!-- commit_ids_reviewed_end --><!-- tips_start -->

---

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?

<details>
<summary>Share</summary>

- [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai)
- [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai)
- [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai)
- [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)

</details>

<details>
<summary>Tips</summary>

### Chat

There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai):

- Review comments: Directly reply to a review comment made by CodeRabbit. Example:
	- `I pushed a fix in commit <commit_id>.`
	- `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 generate interesting stats about this repository and render them as a table.`
	- `@coderabbitai show all the console.log statements in this repository.`
	- `@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.`

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 as PR comments)

- `@coderabbitai pause` to pause the reviews on a PR.
- `@coderabbitai resume` to resume the paused reviews.
- `@coderabbitai review` to trigger a review. This is useful when automatic reviews are disabled for the repository.
- `@coderabbitai resolve` resolve all the CodeRabbit review comments.
- `@coderabbitai help` to get help.


Additionally, you can add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed.

### CodeRabbit Configration 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](https://docs.coderabbit.ai/guides/configure-coderabbit) 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](https://coderabbit.ai/docs) for detailed information on how to use CodeRabbit.
- Join our [Discord Community](https://discord.com/invite/GsXnASn26c) to get help, request features, and share feedback.
- Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.

</details>

<!-- tips_end -->

[coderabbitai]

Actionable comments posted: 1

Out of diff range and nitpick comments (4)

app/controllers/Cart.php (2)

Line range hint 9-47: The viewCart method is well-implemented with default parameter values enhancing flexibility. Consider addressing the commented-out code for clarity and maintainability.

---

Line range hint 49-93: The checkout method efficiently handles the checkout process. Consider using a more secure hashing algorithm than MD5 for better security practices.

app/views/rental/orders.view.php (1)

215-218: The handling of pending orders is well-implemented. Recommend adding CSRF protection to enhance security.

app/views/customer/rent.view.php (1)

128-128: The date selection modal is well-implemented with appropriate validations. Consider enhancing user feedback for validation failures to improve user experience.

[coderabbitai]

Consider removing the commented-out code to clean up the file, as version control systems can handle history.