Skip to content

Commit

Permalink
Merge branch 'release/1.3.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
devAsadNur committed Jan 10, 2025
2 parents 07b55bb + a972049 commit babdb26
Show file tree
Hide file tree
Showing 13 changed files with 71 additions and 56 deletions.
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
**Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988), [wedevs](https://profiles.wordpress.org/wedevs), [nizamuddinbabu](https://profiles.wordpress.org/nizamuddinbabu)
**Donate Link:** http://tareq.co/donate/
**Tags:** WooCommerce POS, point of sale, free pos, pos plugin, woocommerce point of sale
**Requires at least:** 5.4
**Tested up to:** 6.5.3
**WC requires at least:** 5.0.0
**WC tested up to:** 8.9.2
**Requires at least:** 6.5
**Tested up to:** 6.7.1
**WC requires at least:** 8.0.0
**WC tested up to:** 9.5.2
**Requires PHP:** 7.4
**Stable tag:** 1.2.8
**Stable tag:** 1.3.0
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -60,6 +60,11 @@ No FAQ

## Changelog ##

### v1.3.0 -> 10 January, 2025 ###
- **Fix:** POS discount coupons were accessible from single order page on admin dashboard
- **Compatibility:** Compatibility for WordPress 6.7
- **Chore:** Update Appsero client for WP 6.7 compatibility

### v1.2.8 -> 05 June, 2024 ###
- **Feature:** WooCommerce Coupon API integration for cart discount
- **Enhancement:** Added support for WooCommerce customised order numbers by third-party plugins
Expand Down Expand Up @@ -228,4 +233,5 @@ No FAQ
Initial version released

## Upgrade Notice ##
No upgrade notice
### v1.3.0 ###
- If you have **wePos Pro** installed, please ensure it is updated to **version 1.2.1 or later** before upgrading to this version.
8 changes: 4 additions & 4 deletions assets/js/bootstrap.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/js/bootstrap.min.js

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions includes/Admin/Discounts.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* For managing coupons on admin panel.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @package wepos
*/
Expand All @@ -20,7 +20,7 @@ class Discounts {
/**
* Discount Type Key.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @var string
*/
Expand All @@ -29,7 +29,7 @@ class Discounts {
/**
* Class Constructor.
*
* @since WEPOS_SINCE
* @since 1.3.0
*/
public function __construct() {
add_action( 'load-edit.php', [ $this, 'hide_discount_coupons' ] );
Expand All @@ -40,7 +40,7 @@ public function __construct() {
/**
* Hide Discount Coupons from Admin Coupon List Table.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return void
*/
Expand Down Expand Up @@ -93,7 +93,7 @@ function ( $counts ) {
/**
* Get Discount Coupons.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return int[]
*/
Expand Down Expand Up @@ -121,7 +121,7 @@ private function get_discount_coupons(): array {
/**
* Remove Discount Coupons.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return void
*/
Expand All @@ -137,7 +137,7 @@ public function remove_discount_coupons() {
/**
* Remove Discount Coupon URL from Order Item.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @param string $url Coupon URL
* @param \WC_Order_Item_Coupon $item Order Coupon Item
Expand Down
2 changes: 1 addition & 1 deletion includes/Admin/Updates/upgrade-1.2.8.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Run Updates to Schedule Cron Jobs.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return void
*/
Expand Down
12 changes: 6 additions & 6 deletions includes/Installer.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/**
* Installer Class.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @package wepos
*/
Expand All @@ -16,7 +16,7 @@ class Installer {
/**
* Run The Installer.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return void
*/
Expand All @@ -30,7 +30,7 @@ public function run() {
/**
* Add Version Info.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return void
*/
Expand All @@ -47,7 +47,7 @@ private function add_version_info() {
/**
* Add User Roles.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return void
*/
Expand All @@ -70,7 +70,7 @@ private function add_user_roles() {
/**
* Flush Rewrites.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return void
*/
Expand All @@ -81,7 +81,7 @@ private function flush_rewrites() {
/**
* Schedule Cron Jobs.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return void
*/
Expand Down
4 changes: 2 additions & 2 deletions includes/REST/CouponController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
* Coupon API Controller.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @package wepos
*/
Expand All @@ -28,7 +28,7 @@ class CouponController extends \WC_REST_Coupons_Controller {
/**
* Create Item Permission Checking.
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @param \WP_REST_Request $request
*
Expand Down
6 changes: 3 additions & 3 deletions includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ function wepos_get_product_price( $product ) {
/**
* Function current_datetime() compatibility for wp version < 5.3
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return DateTimeImmutable
*/
Expand All @@ -303,7 +303,7 @@ function wepos_current_datetime() {
/**
* Function wp_timezone() compatibility for wp version < 5.3
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return DateTimeZone
*/
Expand All @@ -318,7 +318,7 @@ function wepos_wp_timezone() {
/**
* Function wp_timezone_string() compatibility for wp version < 5.3
*
* @since WEPOS_SINCE
* @since 1.3.0
*
* @return string
*/
Expand Down
24 changes: 14 additions & 10 deletions languages/wepos.pot
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Copyright (C) 2024 weDevs
# Copyright (C) 2025 weDevs
# This file is distributed under the GPL2.
msgid ""
msgstr ""
"Project-Id-Version: wePOS - Point Of Sale (POS) for WooCommerce 1.2.8\n"
"Project-Id-Version: wePOS - Point Of Sale (POS) for WooCommerce 1.3.0\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wepos\n"
"POT-Creation-Date: 2024-06-05 10:56:15+00:00\n"
"POT-Creation-Date: 2025-01-10 08:56:18+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2024-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2025-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"X-Generator: wp-vue-i18n 1.1.4\n"
Expand Down Expand Up @@ -234,7 +234,7 @@ msgstr ""
#: assets/src/frontend/components/Home.vue:327
#: assets/src/frontend/components/Home.vue:488
#: assets/src/frontend/components/Home.vue:501
#: assets/src/frontend/components/Home.vue:985
#: assets/src/frontend/components/Home.vue:987
#: assets/src/frontend/components/PrintReceiptHtml.vue:45
msgid "Discount"
msgstr ""
Expand Down Expand Up @@ -269,7 +269,7 @@ msgstr ""
#: assets/src/frontend/components/Home.vue:328
#: assets/src/frontend/components/Home.vue:492
#: assets/src/frontend/components/Home.vue:505
#: assets/src/frontend/components/Home.vue:1007
#: assets/src/frontend/components/Home.vue:1009
#: assets/src/frontend/components/PrintReceiptHtml.vue:49
msgid "Fee"
msgstr ""
Expand Down Expand Up @@ -391,16 +391,16 @@ msgid "Change money"
msgstr ""

#: assets/src/frontend/components/Home.vue:751
#: assets/src/frontend/components/Home.vue:1182
#: assets/src/frontend/components/Home.vue:1210
#: assets/src/frontend/components/Home.vue:1184
#: assets/src/frontend/components/Home.vue:1212
msgid "All categories"
msgstr ""

#: assets/src/frontend/components/Home.vue:1105
#: assets/src/frontend/components/Home.vue:1107
msgid "This product is out of stock."
msgstr ""

#: assets/src/frontend/components/Home.vue:1121
#: assets/src/frontend/components/Home.vue:1123
msgid "Product is out of stock!"
msgstr ""

Expand Down Expand Up @@ -444,6 +444,10 @@ msgstr ""
msgid "Confirm"
msgstr ""

#: dependencies/Appsero/Insights.php:725
msgid "Once Weekly"
msgstr ""

#: includes/Admin/Admin.php:27
msgid "WePOS"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wepos",
"version": "1.2.8",
"version": "1.3.0",
"description": "Point of Sale plugin for WooCommerce",
"author": "weDevs <info@wedevs.com>",
"license": "GPLv2",
Expand Down
19 changes: 12 additions & 7 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
Contributors: tareq1988, wedevs, nizamuddinbabu
Donate Link: http://tareq.co/donate/
Tags: WooCommerce POS, point of sale, free pos, pos plugin, woocommerce point of sale
Requires at least: 5.4
Tested up to: 6.5.3
WC requires at least: 5.0.0
WC tested up to: 8.9.2
Requires at least: 6.5
Tested up to: 6.7.1
WC requires at least: 8.0.0
WC tested up to: 9.5.2
Requires PHP: 7.4
Stable tag: 1.2.8
Stable tag: 1.3.0
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -60,8 +60,12 @@ No FAQ

== Changelog ==

= v1.3.0 -> 10th January, 2025 =
- **Fix:** POS discount coupons were accessible from single order page on admin dashboard
- **Compatibility:** Compatibility for WordPress 6.7
- **Chore:** Update Appsero client for WP 6.7 compatibility

= v1.2.8 -> 5th June, 2024 =
-----------------------------
- **Feature:** WooCommerce Coupon API integration for cart discount
- **Enhancement:** Added support for WooCommerce customised order numbers by third-party plugins
- **Fix:** Blurry numbers on print receipt
Expand Down Expand Up @@ -253,4 +257,5 @@ No FAQ
Initial version released

== Upgrade Notice ==
No upgrade notice
= 1.3.0 =
If you have wePos Pro installed, please ensure it is updated to version 1.2.1 or later before upgrading to this version.
8 changes: 4 additions & 4 deletions wepos.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
Plugin Name: wePOS - Point Of Sale (POS) for WooCommerce
Plugin URI: https://wedevs.com/wepos
Description: A beautiful and fast Point of Sale (POS) system for WooCommerce
Version: 1.2.8
Version: 1.3.0
Author: weDevs
Author URI: https://wedevs.com/
Text Domain: wepos
Domain Path: /languages
WC requires at least: 5.0.0
WC tested up to: 8.9.2
WC requires at least: 8.0.0
WC tested up to: 9.5.2
License: GPL2
License URI: https://www.gnu.org/licenses/gpl-2.0.html
*/
Expand Down Expand Up @@ -57,7 +57,7 @@ final class WePOS {
*
* @var string
*/
public $version = '1.2.8';
public $version = '1.3.0';

/**
* Holds various class instances
Expand Down

0 comments on commit babdb26

Please sign in to comment.