Skip to content

Commit

Permalink
Merge branch 'develop' into chore/tailwind-css-added
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
Aunshon committed Nov 8, 2023
2 parents db6a56d + 7ae4116 commit 4f8e6ca
Show file tree
Hide file tree
Showing 260 changed files with 51,338 additions and 2,329 deletions.
36 changes: 30 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* [ ] My code is tested
* [ ] My code passes the PHPCS tests
* [ ] My code has proper inline documentation
* [ ] I've included related pull request(s) (optional)
* [ ] I've included developer documentation (optional)
* [ ] I've added proper labels to this pull request

Expand All @@ -16,19 +17,42 @@

<!-- Describe the changes made to this Pull Request and the reason for such changes. -->

Closes # .
### Related Pull Request(s)

### How to test the changes in this Pull Request:
* Full PR Link


### Closes

* Closes #

1.
2.
3.

### How to test the changes in this Pull Request:

* Steps or issue link


### Changelog entry

> Enter a summary of all changes on this Pull Request. This will appear in the changelog if accepted.
*Title*

Detailed Description of the pull request. What was previous behaviour
and what will be changed in this PR.


### Before Changes

Describe the issue before changes with screenshots(s).


### After Changes

Describe the issue after changes with screenshot(s).


### Feature Video (optional)

Link of detailed video if this PR is for a feature.


### PR Self Review Checklist:
Expand Down
208 changes: 208 additions & 0 deletions .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
name: End-to-End Tests Lite

on:
schedule:
- cron: '0 8 * * *'
pull_request:
push:
branches:
- develop
workflow_dispatch:

# Cancels all previous workflow runs for pull requests that have not completed.
concurrency:
# The concurrency group contains the workflow name and the branch name for pull requests or the commit hash for any other events.
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
cancel-in-progress: true

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

env:
ADMIN: admin
ADMIN_PASSWORD: password
VENDOR: vendor1
VENDOR2: vendor2
CUSTOMER: customer1
USER_PASSWORD: 01dokan01
GMAP: ${{secrets.GMAP}}
BASE_URL: http://localhost:9999
CI: true
FORCE_COLOR: 1
DB_HOST_NAME: localhost
DB_USER_NAME: root
DB_USER_PASSWORD: password
DATABASE: tests-wordpress
DB_PREFIX: wp
PR_NUMBER: ${{ github.event.number }}
SHA: ${{ github.event.pull_request.head.sha }}
SYSTEM_INFO: ./tests/pw/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
runs-on: ubuntu-latest
# strategy:
# fail-fast: false

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

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

- name: Composer install and build (Dokan-lite)
if: success()
run: |
composer install --no-dev
composer dump-autoload -o
- name: Npm install and build (Dokan-lite)
if: success()
run: |
npm ci
npm run build
# Install test dependencies
- name: Install dependencies
if: success()
run: |
cd tests/pw
npm ci
# Start wordpress environment
- name: Start WordPress Env
id: wp-env
if: success()
run: |
cd tests/pw
npm run start:env
# Grab test db port
- name: Get Test DB PORT
id: db-port
if: success()
run: |
cd tests/pw
echo "DB_PORT=$(docker ps -f ancestor='mariadb' -f name='tests-mysql' --format='{{.Ports}}' | sed -E 's/.*:(.*)->.*/\1/')" >> $GITHUB_ENV
# db port
- name: DB PORT
if: success()
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
if: success()
run: |
cd tests/pw
npm run wp-env run tests-cli wp rewrite structure /%postname%/
# Activate theme
- name: Activate theme:Storefront
if: success()
run: |
cd tests/pw
npm run wp-env run tests-cli wp theme activate storefront
# Get Playwright version
- name: Get installed Playwright version
id: playwright-version
if: success()
run: |
cd tests/pw
echo "PLAYWRIGHT_VERSION=$(npm ls @playwright/test --json | jq --raw-output '.dependencies["@playwright/test"].version')" >> $GITHUB_ENV
# Cache browser binaries, cache key is based on Playwright version and OS
- name: Cache playwright binaries
id: playwright-cache
if: success()
uses: actions/cache@v3
with:
path: |
~/.cache/ms-playwright
key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
restore-keys: |
${{ runner.os }}-playwright-
# Install browser binaries & OS dependencies if cache missed
- name: Install Playwright browser binaries & OS dependencies
id: pw-install
if: success() && steps.playwright-cache.outputs.cache-hit != 'true'
run: |
cd tests/pw
npm run pw:browser-with-deps
# Run e2e tests
- name: 🧪 Running the e2e tests
id: e2e-test
if: steps.pw-install.outcome == 'success'
timeout-minutes: 40
run: |
cd tests/pw
npm run test:e2e:lite
# Run API tests
- name: 🧪 Running the api tests
id: api-test
if: always()
timeout-minutes: 5
run: |
cd tests/pw
npm run test:api:lite
# Prepare test summary
- name: Prepare test summary
id: prepare-test-summary
uses: actions/github-script@v6
if: always()
with:
result-encoding: string
script: |
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

# Upload artifacts
- name: Archive test artifacts (screenshots, HTML snapshots, Reports)
uses: actions/upload-artifact@v3
if: always()
with:
name: test-artifact
path: |
tests/pw/playwright
tests/pw/playwright-report
if-no-files-found: ignore
retention-days: 30
29 changes: 26 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.1
**Tested up to:** 6.3.2
**WC requires at least:** 5.0.0
**WC tested up to:** 8.1.1
**WC tested up to:** 8.2.1
**Requires PHP:** 7.3
**Stable tag:** 3.8.3
**Stable tag:** 3.9.1
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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

## Changelog ##

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

- **update:** Removed flaticon packages and replace used icons with fontAwesome icons. This will reduce the plugin zip size.
- **update:** Added a new settings to disable fontAwesome library
- **update:** Changed all the single date picker fields with daterange picker. This updates will keep the design consistent throughout the plugin.
- **fix:** [StoreOpenCloseTime] An issue where invalid store opening or closing times generate warning and fatal error on single store page.
- **fix:** [Email] Fixed an issue where the product edit link on email template redirects to the products listing instead of single product edit page
- **fix:** Fixed some responsive issue under vendor dashboard product edit page.
- **fix:** Fixed some responsive issue under vendor dashboard withdraw page.

### v3.9.0 ( Oct 06, 2023 ) ###

- **new:** Added two new hooks named `dokan_get_admin_report_data` and `dokan_get_overview_data` to extend Dokan reports functionality.
- **fix:** Resolved an issue where the `Tracking Number` button was still visible under the `Vendor Dashboard → Order Details → Order Note section` even after the `Shipment Tracking` feature was enabled by the admin.
- **fix:** [WidgetProductAttribute] Fixed an issue where the `Filter Products by Attribute` widget was not working for Multi-Word Attributes.
- **update:** Added a new filter named `dokan_get_store_url` to filter store URLs for a single store.
- **update:** Removed some redundant or not required settings from vendor store settings page, also rearranged some admin settings and added some settings under Admin dashboard.
Details:
1. Removed `Show Vendor Info` settings under the `WordPress Admin Dashboard → Dokan → Settings → Appearance` and added it back under the `WordPress Admin Dashboard → Dokan → Settings → General → Product Page Settings` section.
2. Removed the `More Products` setting under `Vendor Dashboard → Settings → Store Settings` and added it back as a new Admin setting under `WordPress Admin Dashboard → Dokan → Settings → General → Product Page Settings` section. Now, only the admin can control this setting.
3. Removed redundant `Store Products Per Page` setting under `Vendor Dashboard → Settings → Store Settings`. Since the admin already has this setting under `WordPress Admin Dashboard → Dokan → Settings → General`, this setting will be used from now on and only the admin can control this setting.
4. Removed redundant `Store Page Product Section` settings under `Vendor Dashboard → Settings → Store Page Product Section`. Now, only the admin can control these settings under Theme Customizer settings.

### v3.8.3 ( Sep 26, 2023 ) ###

- **update:** Added advanced filtering and CSV export feature for vendor withdraws under Admin Dashboard → Dokan → Withdraw menu.
Expand Down
50 changes: 44 additions & 6 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5643,6 +5643,30 @@ div.media-sidebar a.edit-attachment {
text-align: right;
border-top: 1px solid #eee;
}
@media only screen and (max-width: 500px) {
.dokan-withdraw-content .dokan-withdraw-area .entry-content .dokan-panel .dokan-panel-body .dokan-panel-inner-container {
display: flex;
flex-direction: column;
}
.dokan-withdraw-content .dokan-withdraw-area .entry-content .dokan-panel .dokan-panel-body .dokan-panel-inner-container .dokan-w5 {
position: relative;
left: 0;
right: 100%;
top: 100%;
transform: none;
margin-top: 20px;
}
.dokan-withdraw-content .dokan-withdraw-area .entry-content .dokan-withdraw-status-filter-container .dokan-add-product-link a {
margin: 15px 0;
}
.dokan-withdraw-content .dokan-withdraw-area table.dokan-table-striped {
overflow: auto;
display: block;
}
.dokan-withdraw-content .dokan-withdraw-area table.dokan-table-striped tbody tr th {
width: 150px;
}
}
.dokan-login-form-popup-wrapper {
width: 430px !important;
padding: 16px !important;
Expand Down Expand Up @@ -6410,7 +6434,7 @@ p.vendor-customer-registration .radio:hover {
.dokan-dashboard .dokan-dashboard-content {
float: none;
width: 100%;
padding: 20px;
padding: 20px 0;
}
.dokan-dashboard .dokan-dash-sidebar .dokan-table,
.dokan-dashboard .dokan-dashboard-content .dokan-table {
Expand Down Expand Up @@ -6471,21 +6495,35 @@ p.vendor-customer-registration .radio:hover {
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-date-filter {
display: flex;
flex-flow: column wrap;
justify-content: space-between;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-date-filter .dokan-form-group {
margin-bottom: 0;
margin-bottom: 10px;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-search-form {
margin-top: 15px;
width: 100%;
display: flex;
justify-content: space-between;
flex-flow: row-reverse nowrap;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-search-form .dokan-form-group {
margin-bottom: 0;
margin-right: 0;
width: 73%;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area #product-filter .dokan-form-group {
margin-top: 15px;
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-search-form .dokan-btn {
width: 25%;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area #dokan-bulk-action-selector {
width: 73%;
margin-right: 2%;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area #dokan-bulk-action-submit {
width: 25%;
margin-right: 0;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area #product-filter .dokan-btn {
width: 100%;
}
.dokan-dashboard .dokan-right,
.dokan-dashboard .dokan-left {
Expand Down
Binary file removed assets/font/flaticon/Flaticon.eot
Binary file not shown.
Loading

0 comments on commit 4f8e6ca

Please sign in to comment.