Skip to content

Commit

Permalink
Merge branch 'release/1.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
nurul-umbhiya committed Dec 21, 2020
2 parents 654f1ff + 6504844 commit 82342e9
Show file tree
Hide file tree
Showing 9 changed files with 161 additions and 82 deletions.
22 changes: 19 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 POS, point of sale, free pos, pos plugin, woocommerce point of sale
**Requires at least:** 4.4
**Tested up to:** 5.3.2
**Tested up to:** 5.6
**WC requires at least:** 3.0
**WC tested up to:** 3.8.1
**WC tested up to:** 4.8
**Requires PHP:** 5.6
**Stable tag:** trunk
**Stable tag:** 1.1.4
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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

## Changelog ##

### v1.1.4 -> 21 December, 2020 ###

- **Enhancement:** Added limited promotion banner

### v1.1.3 -> 23 November, 2020 ###

- **Enhancement:** Added limited promotion banner

### v1.1.2 -> 28 October, 2020 ###
- **Fix:** Permission callback warnings
- **Fix:** Duplicate order get generated if pay now button pressed twice while doing payment.
- **Fix:** While Dokan installed, login was redirecting back to account page.
- **Feature:** Cash input checking and Validation for Cash payment
- **Feature:** Cart data validation for payment for currently active cart tab
- **Feature:** Dynamic Pay now button based on current cart tab

### v1.1.1 -> 23 December, 2019 ###
- **Tweak** Appser client updated

Expand Down
4 changes: 3 additions & 1 deletion appsero.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"package-lock.json",
"webpack.config.js",
".editorconfig",
".svnignore"
".svnignore",
"bin",
"build"
]
}
73 changes: 73 additions & 0 deletions bin/zip.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
#!/usr/bin/env bash

# Exit if any command fails.
set -e

# Change to the expected directory.
cd "$(dirname "$0")"
cd ..
DIR=$(pwd)
BUILD_DIR="$DIR/build/wepos"

# Enable nicer messaging for build status.
BLUE_BOLD='\033[1;34m';
GREEN_BOLD='\033[1;32m';
RED_BOLD='\033[1;31m';
YELLOW_BOLD='\033[1;33m';
COLOR_RESET='\033[0m';
error () {
echo -e "\n${RED_BOLD}$1${COLOR_RESET}\n"
}
status () {
echo -e "\n${BLUE_BOLD}$1${COLOR_RESET}\n"
}
success () {
echo -e "\n${GREEN_BOLD}$1${COLOR_RESET}\n"
}
warning () {
echo -e "\n${YELLOW_BOLD}$1${COLOR_RESET}\n"
}

status "💃 Time to build the wePOS Pro ZIP file 🕺"

# remove the build directory if exists and create one
rm -rf "$DIR/build"
mkdir -p "$BUILD_DIR"

# Run the build.
# status "Installing dependencies... 📦"
# npm install

status "Generating build... 👷‍♀️"
npm run dev-build
npm run build

# Copy all files
status "Copying files... ✌️"
FILES=(wepos.php readme.txt assets includes languages templates composer.json composer.lock)

for file in ${FILES[@]}; do
cp -R $file $BUILD_DIR
done

# Delete the source JS directory
rm -rf "$BUILD_DIR/assets/src"
rm -rf "$BUILD_DIR/assets/less"

# Install composer dependencies
status "Installing dependencies... 📦"
cd $BUILD_DIR
composer install --optimize-autoloader --no-dev -q

# Remove composer files
rm composer.json composer.lock

# go one up, to the build dir
status "Creating archive... 🎁"
cd ..
zip -r -q wepos.zip wepos

# remove the source directory
rm -rf wepos

success "Done. You've built wePOS! 🎉 "
30 changes: 7 additions & 23 deletions includes/admin/LimitedTimePromotion.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,13 @@ public function show_promotions() {

$notices = [
[
'key' => 'early-bird-black-friday-2020',
'start_date' => '2020-11-23 09:00:00 EST',
'end_date' => '2020-11-23 13:59:00 EST',
'title' => 'Enjoy Flat 50% OFF on wePos.',
'content' => 'Get Your Early Bird Black Friday Deals Now.',
'link' => 'https://wedevs.com/wepos/pricing?utm_medium=text&utm_source=wordpress-wepos',
],
[
'key' => 'black-friday-2020',
'start_date' => '2020-11-23 14:00:00 EST',
'end_date' => '2020-11-27 23:59:00 EST',
'title' => 'Enjoy Up To 50% OFF on wePos.',
'content' => 'Get Your Black Friday Deals Now.',
'link' => 'https://wedevs.com/wepos/pricing?utm_medium=text&utm_source=wordpress-wepos',
],
[
'key' => 'cyber-monday-2020',
'start_date' => '2020-11-28 00:00:00 EST',
'end_date' => '2020-12-04 23:59:00 EST',
'title' => 'Enjoy Up To 50% OFF on wePos.',
'content' => 'Get Your Cyber Monday Deals Now.',
'link' => 'https://wedevs.com/wepos/pricing?utm_medium=text&utm_source=wordpress-wepos',
],
'key' => 'holiday-2020',
'start_date' => '2020-12-22 09:00:00 EST',
'end_date' => '2021-01-08 23:59:00 EST',
'title' => 'Enjoy Flat 50% OFF on wePOS Pro.',
'content' => 'Get Your Holiday Deals Now',
'link' => 'https://wedevs.com/wepos/pricing?utm_medium=text&utm_source=wordpress-wepos-holidays',
]
];

if ( empty( $notices ) ) {
Expand Down
92 changes: 46 additions & 46 deletions languages/wepos.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# This file is distributed under the GPL2.
msgid ""
msgstr ""
"Project-Id-Version: wePOS - Point Of Sale (POS) for WooCommerce 1.1.3\n"
"Project-Id-Version: wePOS - Point Of Sale (POS) for WooCommerce 1.1.4\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wepos\n"
"POT-Creation-Date: 2020-11-23 02:16:41+00:00\n"
"POT-Creation-Date: 2020-12-21 12:49:11+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -465,7 +465,7 @@ msgid "No gateway found"
msgstr ""

#: assets/js/frontend.min.js:1 assets/src/frontend/components/Home.vue:510
#: includes/gateways/Cash.php:36 includes/gateways/Cash.php:58
#: includes/Gateways/Cash.php:36 includes/Gateways/Cash.php:58
msgid "Cash"
msgstr ""

Expand Down Expand Up @@ -501,6 +501,46 @@ msgstr ""
msgid "Point of Sale"
msgstr ""

#: includes/Gateways/Cash.php:37
msgid "Have your customers pay with cash"
msgstr ""

#: includes/Gateways/Cash.php:48
msgid "Enable/Disable"
msgstr ""

#: includes/Gateways/Cash.php:49
msgid "Enable cash gateway"
msgstr ""

#: includes/Gateways/Cash.php:55
msgid "Title"
msgstr ""

#: includes/Gateways/Cash.php:57
msgid "Payment method description that the marchent see in pos checkout"
msgstr ""

#: includes/Gateways/Cash.php:62
msgid "Description"
msgstr ""

#: includes/Gateways/Cash.php:64
msgid "Payment method description that marchent see in pos checkout page"
msgstr ""

#: includes/Gateways/Cash.php:65
msgid "Pay with cash"
msgstr ""

#: includes/Gateways/Cash.php:100
msgid "Payment collected via cash"
msgstr ""

#: includes/Gateways/Cash.php:101
msgid "Cash tendered amount: %1$s, Change amount: %2$s"
msgstr ""

#: includes/REST/CustomerController.php:42
msgid "New user email address."
msgstr ""
Expand Down Expand Up @@ -544,15 +584,15 @@ msgstr ""
msgid "Is POS"
msgstr ""

#: includes/admin/LimitedTimePromotion.php:96
#: includes/admin/LimitedTimePromotion.php:80
msgid "Get Deals →"
msgstr ""

#: includes/admin/LimitedTimePromotion.php:181
#: includes/admin/LimitedTimePromotion.php:165
msgid "You have no permission to do that"
msgstr ""

#: includes/admin/LimitedTimePromotion.php:185 includes/admin/Settings.php:39
#: includes/admin/LimitedTimePromotion.php:169 includes/admin/Settings.php:39
#: includes/admin/Settings.php:66
msgid "Invalid nonce"
msgstr ""
Expand Down Expand Up @@ -661,46 +701,6 @@ msgstr ""
msgid "Thank you"
msgstr ""

#: includes/gateways/Cash.php:37
msgid "Have your customers pay with cash"
msgstr ""

#: includes/gateways/Cash.php:48
msgid "Enable/Disable"
msgstr ""

#: includes/gateways/Cash.php:49
msgid "Enable cash gateway"
msgstr ""

#: includes/gateways/Cash.php:55
msgid "Title"
msgstr ""

#: includes/gateways/Cash.php:57
msgid "Payment method description that the marchent see in pos checkout"
msgstr ""

#: includes/gateways/Cash.php:62
msgid "Description"
msgstr ""

#: includes/gateways/Cash.php:64
msgid "Payment method description that marchent see in pos checkout page"
msgstr ""

#: includes/gateways/Cash.php:65
msgid "Pay with cash"
msgstr ""

#: includes/gateways/Cash.php:100
msgid "Payment collected via cash"
msgstr ""

#: includes/gateways/Cash.php:101
msgid "Cash tendered amount: %1$s, Change amount: %2$s"
msgstr ""

#. Plugin Name of the plugin/theme
msgid "wePOS - Point Of Sale (POS) for WooCommerce"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wepos",
"version": "1.1.3",
"version": "1.1.4",
"description": "Point of Sale plugin for WooCommerce",
"author": "weDevs <info@wedevs.com>",
"license": "GPLv2",
Expand All @@ -9,7 +9,7 @@
"dev": "cross-env WEBPACK_ENV=development webpack --progress --colors --watch --hide-modules",
"dev-build": "cross-env WEBPACK_ENV=development webpack",
"build": "cross-env WEBPACK_ENV=production webpack && wpvuei18n makepot",
"zip": "node build/"
"zip": "./bin/zip.sh"
},
"dependencies": {
"@mathieustan/vue-datepicker": "^0.2.8",
Expand Down
10 changes: 7 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ 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: 4.4
Tested up to: 5.5
Tested up to: 5.6
WC requires at least: 3.0
WC tested up to: 4.6
WC tested up to: 4.8
Requires PHP: 5.6
Stable tag: 1.1.3
Stable tag: 1.1.4
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

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

== Changelog ==

= v1.1.4 -> 21 December, 2020 =

- **Enhancement:** Added limited promotion banner

= v1.1.3 -> 23 November, 2020 =

- **Enhancement:** Added limited promotion banner
Expand Down
6 changes: 3 additions & 3 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.1.3
Version: 1.1.4
Author: weDevs
Author URI: https://wedevs.com/
Text Domain: wepos
Domain Path: /languages
WC requires at least: 3.0
WC tested up to: 4.6
WC tested up to: 4.8
License: GPL2
License URI: https://www.gnu.org/licenses/gpl-2.0.html
*/
Expand Down Expand Up @@ -58,7 +58,7 @@ final class WePOS
*
* @var string
*/
public $version = '1.1.3';
public $version = '1.1.4';

/**
* Holds various class instances
Expand Down

0 comments on commit 82342e9

Please sign in to comment.