Skip to content

Commit

Permalink
Merge branch 'release/3.10.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
nurul-umbhiya committed Mar 4, 2024
2 parents 28888e6 + fda8905 commit 045f602
Show file tree
Hide file tree
Showing 256 changed files with 8,471 additions and 15,358 deletions.
54 changes: 35 additions & 19 deletions .github/workflows/e2e_api_tests.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: E2E_API Tests

on:
# workflow will run daily at 8:00 AM BDT (2:00 AM UTC)
schedule:
# workflow will run daily at 8:00 AM BDT (2:00 AM UTC)
- cron: '0 2 * * *'
# workflow will trigger on pull request
pull_request:
Expand All @@ -13,15 +13,15 @@ on:

# workflow can be manually triggered
workflow_dispatch:
inputs:
testsuite:
description: Choose which test suite to run
default: All
type: choice
options:
- E2E
- API
- All
inputs:
testsuite:
description: Choose which test suite to run
default: All
type: choice
options:
- E2E
- API
- All

# Cancels all previous workflow runs for pull requests that have not completed.
concurrency:
Expand Down Expand Up @@ -58,6 +58,7 @@ env:
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
API_COVERAGE: ./tests/pw/playwright-report/api/coverage-report/coverage.json

jobs:
tests:
Expand All @@ -66,19 +67,19 @@ jobs:

steps:
- name: Checkout testing repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use desired version of NodeJS
if: success()
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16'
cache: 'npm'

- name: Composer install and build (Dokan-lite)
if: success()
run: |
composer install --no-dev -o
composer install --no-dev -o
- name: Npm install and build (Dokan-lite)
if: success()
Expand All @@ -87,12 +88,19 @@ jobs:
npm run build
# Install test dependencies
- name: Install dependencies
- name: Install test dependencies
if: success()
run: |
cd tests/pw
npm ci
# Create wp debuglog file
- name: Create wp debuglog file
if: success()
run: |
cd tests/pw
mkdir -p wp-data && touch wp-data/debug.log
# Start wordpress environment
- name: Start WordPress Env
id: wp-env
Expand Down Expand Up @@ -142,7 +150,7 @@ jobs:
- name: Cache playwright binaries
id: playwright-cache
if: success()
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/ms-playwright
Expand Down Expand Up @@ -186,7 +194,7 @@ jobs:
# Prepare test summary
- name: Prepare test summary
id: prepare-test-summary
uses: actions/github-script@v6
uses: actions/github-script@v7
if: always()
with:
result-encoding: string
Expand All @@ -196,7 +204,7 @@ jobs:
# # Find PR comment
# - name: Find PR comment by github-actions[bot]
# uses: peter-evans/find-comment@v2
# uses: peter-evans/find-comment@v3
# id: find-comment
# if: github.event_name == 'pull_request'
# with:
Expand All @@ -206,7 +214,7 @@ jobs:

# # Post test summary as PR comment
# - name: Create or update PR comment
# uses: peter-evans/create-or-update-comment@v2
# uses: peter-evans/create-or-update-comment@v4
# if: github.event_name == 'pull_request'
# with:
# comment-id: ${{ steps.find-comment.outputs.comment-id }}
Expand All @@ -215,13 +223,21 @@ jobs:
# reactions: hooray
# edit-mode: replace

# Backup Database
- name: Backup Database
if: success()
run: |
cd tests/pw
npm run wp-env run tests-cli wp db export wp-data/db.sql
# Upload artifacts
- name: Archive test artifacts (screenshots, HTML snapshots, Reports)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: test-artifact
path: |
tests/pw/wp-data
tests/pw/playwright
tests/pw/playwright-report
if-no-files-found: ignore
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
**Requires at least:** 5.6
**Tested up to:** 6.4.3
**WC requires at least:** 5.0.0
**WC tested up to:** 8.5.2
**WC tested up to:** 8.6.1
**Requires PHP:** 7.4
**Stable tag:** 3.9.9
**Stable tag:** 3.10.0
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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

## Changelog ##

### v3.10.0 ( Mar 04, 2024 ) ###

- **new:** Added a new filter hook named `dokan_product_cache_delete_all_data`, by using this one can prevent deleting product cache if necessary.
- **update:** Updated FontAwesome library to version 6.5.1
- **fix:** Fixed Elementor mega menu z-index conflict and removed line break from address fields

### v3.9.9 ( Feb 12, 2024 ) ###

- **new:** Added PHP 8.2 support
Expand Down
12 changes: 10 additions & 2 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5284,6 +5284,9 @@ div.media-sidebar a.edit-attachment {
font-size: 25px;
text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.55);
}
.dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info .store-social-wrapper .store-social li a i.fa-square-x-twitter {
color: #000000;
}
.dokan-single-store .profile-frame .profile-info-box.profile-layout-default img.profile-info-img {
position: absolute;
top: 0;
Expand Down Expand Up @@ -5524,6 +5527,10 @@ div.media-sidebar a.edit-attachment {
.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info .store-social-wrapper .store-social li a i {
font-size: 25px;
text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.55);
color: #0B8379;
}
.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info .store-social-wrapper .store-social li a i.fa-square-x-twitter {
color: #000000;
}
.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout2 .profile-info-summery-wrapper .profile-info-summery .profile-info {
margin-top: 0;
Expand Down Expand Up @@ -5995,7 +6002,6 @@ p.vendor-customer-registration .radio:hover {
position: absolute;
top: 0;
left: 0;
z-index: 9;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.45);
Expand Down Expand Up @@ -6041,13 +6047,15 @@ p.vendor-customer-registration .radio:hover {
margin: 0 0 5px 0;
line-height: 23px;
}
#dokan-seller-listing-wrap.grid-view .store-content .store-data-container .store-data .store-address br {
display: none;
}
#dokan-seller-listing-wrap.grid-view .store-content .store-data-container .store-data .store-phone {
margin: 0 0 5px 0;
}
#dokan-seller-listing-wrap.grid-view .store-footer {
background: #fff;
position: relative;
z-index: 99;
}
#dokan-seller-listing-wrap.grid-view .store-footer a:active,
#dokan-seller-listing-wrap.grid-view .store-footer a:focus {
Expand Down
Loading

0 comments on commit 045f602

Please sign in to comment.