Skip to content

Commit

Permalink
Merge branch 'develop' into update/email-rafactors
Browse files Browse the repository at this point in the history
# Conflicts:
#	includes/Emails/Manager.php
  • Loading branch information
shohag121 committed Nov 20, 2023
2 parents caf82eb + bf3e013 commit 040a00b
Show file tree
Hide file tree
Showing 83 changed files with 4,468 additions and 2,089 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: End-to-End Tests Lite
name: E2E_API Tests

on:
schedule:
- cron: '0 8 * * *'
# workflow will run daily at 8:00 AM BDT (2:00 AM UTC)
- cron: '0 2 * * *'
# workflow will trigger on pull request
pull_request:
branches: [develop]
# workflow will trigger on push to develop branch
push:
branches:
- develop
branches: [develop]

# workflow can be manually triggered
workflow_dispatch:

# Cancels all previous workflow runs for pull requests that have not completed.
Expand All @@ -15,12 +20,14 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
cancel-in-progress: true

# workflow permissions
permissions:
checks: write
contents: read
contents: write
issues: write
pull-requests: write

# workflow environment variables
env:
ADMIN: admin
ADMIN_PASSWORD: password
Expand All @@ -39,16 +46,14 @@ env:
DB_PREFIX: wp
PR_NUMBER: ${{ github.event.number }}
SHA: ${{ github.event.pull_request.head.sha }}
SYSTEM_INFO: ./tests/pw/systemInfo.json
SYSTEM_INFO: ./tests/pw/playwright/systemInfo.json
API_TEST_RESULT: ./tests/pw/playwright-report/api/summary-report/results.json
E2E_TEST_RESULT: ./tests/pw/playwright-report/e2e/summary-report/results.json

jobs:
tests:
name: e2e tests
name: e2e_api tests
runs-on: ubuntu-latest
# strategy:
# fail-fast: false

steps:
- name: Checkout testing repo
Expand Down Expand Up @@ -102,7 +107,6 @@ jobs:
run: |
cd tests/pw
echo "The value of test DB_PORT is ${{ env.DB_PORT }}"
echo "The value of test DB_PORT is ${{ env.GMAP }}"
# Set permalink structure
- name: Set Permalink structure
Expand Down Expand Up @@ -146,10 +150,17 @@ jobs:
cd tests/pw
npm run pw:browser-with-deps
# Install only the OS dependencies if cache hit not needed
- name: Install Playwright OS dependencies
if: steps.playwright-cache.outputs.cache-hit == 'true'
run: |
cd tests/pw
npm run pw:deps-only
# Run e2e tests
- name: 🧪 Running the e2e tests
id: e2e-test
if: steps.pw-install.outcome == 'success'
if: success()
timeout-minutes: 40
run: |
cd tests/pw
Expand All @@ -158,7 +169,7 @@ jobs:
# Run API tests
- name: 🧪 Running the api tests
id: api-test
if: always()
if: always() && steps.db-port.outcome == 'success'
timeout-minutes: 5
run: |
cd tests/pw
Expand All @@ -175,25 +186,26 @@ jobs:
const script = require("./tests/pw/utils/gitTestSummary.ts")
return await script({github, context, core})
# Find PR comment
- name: Find PR comment by github-actions[bot]
uses: peter-evans/find-comment@v2
id: find-comment
if: github.event_name == 'pull_request'
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: 'github-actions[bot]'
body-includes: Tests Summary

# Post test summary as PR comment
- name: Create or update PR comment
uses: peter-evans/create-or-update-comment@v2
if: github.event_name == 'pull_request'
with:
comment-id: ${{ steps.find-comment.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
body: ${{ steps.prepare-test-summary.outputs.result }}
edit-mode: replace
# # Find PR comment
# - name: Find PR comment by github-actions[bot]
# uses: peter-evans/find-comment@v2
# id: find-comment
# if: github.event_name == 'pull_request'
# with:
# issue-number: ${{ github.event.pull_request.number }}
# comment-author: 'github-actions[bot]'
# body-includes: Tests Summary

# # Post test summary as PR comment
# - name: Create or update PR comment
# uses: peter-evans/create-or-update-comment@v2
# if: github.event_name == 'pull_request'
# with:
# comment-id: ${{ steps.find-comment.outputs.comment-id }}
# issue-number: ${{ github.event.pull_request.number }}
# body: ${{ steps.prepare-test-summary.outputs.result }}
# reactions: hooray
# edit-mode: replace

# Upload artifacts
- name: Archive test artifacts (screenshots, HTML snapshots, Reports)
Expand Down
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
**Donate Link:** http://tareq.co/donate/
**Tags:** WooCommerce multivendor marketplace, multi vendor marketplace, multi seller store, multi-vendor, multi seller, commissions, multivendor, marketplace, product vendors, woocommerce vendor, commission rate, e-commerce, woocommerce, ebay, ecommerce.
**Requires at least:** 5.6
**Tested up to:** 6.3.2
**Tested up to:** 6.4.1
**WC requires at least:** 5.0.0
**WC tested up to:** 8.2.1
**WC tested up to:** 8.2.2
**Requires PHP:** 7.3
**Stable tag:** 3.9.1
**Stable tag:** 3.9.2
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -338,6 +338,14 @@ A. Just install and activate the PRO version without deleting the free plugin. A

## Changelog ##

### v3.9.2 ( Nov 10, 2023 ) ###

- **new:** A new email template has been introduced named Dokan Vendor Product Review. After a product has been reviewed, an email containing information about the review is sent to the vendor. The email includes details such as the reviewer’s name, product name, review rating, and text. The email also contains a link to the review page where the vendor can view the review and respond if necessary.
- **update:** Display a non-purchasable notice for the vendor’s own products.
- **fix:** [RestAPI] Fixed an issue where getting a single order via API gives an 'invalid ID' error If the compatibility mode isn't enabled for the HPOS feature on WooCOmmerce Order data storage settings
- **fix:** [ProductReview] Previously the email notification sent by WordPress when a review was added to a product, was sent to the product owner. This was wrong in the context of a marketplace. Because the email sent by WordPress includes some sensitive information, like the admin dashboard URL, customer email address, etc. With these changes, we are making sure that only the marketplace admin gets the new review emails sent by WordPress.
- **fix:** Previously, there was an issue where selecting “All,” then “None,” and subsequently “All” again didn’t function as expected. This occurred on the vendor product edit page for simple products, specifically within the Attributes section. However, following this update, all special cases of the “Select All” feature now work flawlessly.

### v3.9.1 ( Oct 17, 2023 ) ###

- **update:** Removed flaticon packages and replace used icons with fontAwesome icons. This will reduce the plugin zip size.
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dokan-promo-notice.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/dokan.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/vue-admin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/vue-bootstrap.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/vue-frontend.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/src/js/product-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -476,14 +476,14 @@

selectAllAttr: function(e) {
e.preventDefault();
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values option' ).attr( 'selected', 'selected' );
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values option' ).attr( 'selected', true );
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values' ).trigger( 'change' );
return false;
},

selectNoneAttr: function(e) {
e.preventDefault();
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values option' ).removeAttr( 'selected' );
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values option' ).attr( 'selected', false );
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values' ).trigger( 'change' );
return false;
},
Expand Down
Loading

0 comments on commit 040a00b

Please sign in to comment.