From bae3ae8804cf4dd152f0de0f914db4bc0ae6329b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C5=A9ng=20Nguy=E1=BB=85n?= <contact@dungnt.net>
Date: Sat, 25 Nov 2017 13:48:02 +0700
Subject: [PATCH 1/4] =?UTF-8?q?Gi=E1=BB=9Bi=20h=E1=BA=A1n=20ti=C3=AAu=20?=
 =?UTF-8?q?=C4=91=E1=BB=81=20v=C3=A0=20ghi=20ch=C3=BA=20d=C6=B0=E1=BB=9Bi?=
 =?UTF-8?q?=20100=20k=C3=AD=20t=E1=BB=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Khi thêm mới coupon
---
 admin.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/admin.php b/admin.php
index 7a6fad2..a9ef5fd 100644
--- a/admin.php
+++ b/admin.php
@@ -406,7 +406,17 @@ function nhymxu_coupon_exec( action_type ) {
 			if( input['save'].length > 5 ) {
 				nhymxu_insert_log('Mức giảm giá phải dưới 6 kí tự.');
 				return false;
-			} 
+			}
+
+			if( input['title'].length > 100 ) {
+				nhymxu_insert_log('Tiêu đề phải dưới 100 kí tự.');
+				return false;
+			}
+
+			if( input['note'].length > 100 ) {
+				nhymxu_insert_log('Ghi chú phải dưới 100 kí tự.');
+				return false;
+			}
 
 			function exec_after_success() {
 				if( action_type === 0 ) {

From 7fbd8396416b68cadf97fad47027a9baf2bffbda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C5=A9ng=20Nguy=E1=BB=85n?= <contact@dungnt.net>
Date: Sat, 25 Nov 2017 14:06:15 +0700
Subject: [PATCH 2/4] =?UTF-8?q?check=20url=20&=20kh=C3=B4ng=20=C4=91=C6=B0?=
 =?UTF-8?q?=E1=BB=A3c=20l=C3=A0=20deeplink?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/admin.php b/admin.php
index a9ef5fd..d832508 100644
--- a/admin.php
+++ b/admin.php
@@ -359,6 +359,10 @@ public function admin_page_callback_addnew() {
 			display: inline-block;
 			min-width: 250px;
 		}
+		#nhymxu_coupon_notice {
+			margin-top: 20px;
+			margin-bottom: 20px;
+		}
 		</style>
 		<script type="text/javascript">
 		/*
@@ -418,6 +422,16 @@ function nhymxu_coupon_exec( action_type ) {
 				return false;
 			}
 
+			if( input['url'].indexOf('http://') < 0 && input['url'].indexOf('https://') < 0 ) {
+				nhymxu_insert_log('Link phải bắt đầu bằng http:// hoặc https://');
+				return false;
+			}
+
+			if( input['url'].indexOf('pub.accesstrade.vn') > 0 || input['url'].indexOf('fast.accesstrade.com.vn') > 0 ) {
+				nhymxu_insert_log('Không được điền deeplink AccessTrade ở đây.');
+				return false;
+			}
+
 			function exec_after_success() {
 				if( action_type === 0 ) {
 					window.location.href = '<?=admin_url('admin.php?page=accesstrade_coupon');?>';

From 80b2d451c2be26bf6e92ba571d3861aee4deeb1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C5=A9ng=20Nguy=E1=BB=85n?= <contact@dungnt.net>
Date: Tue, 12 Dec 2017 15:50:26 +0700
Subject: [PATCH 3/4] =?UTF-8?q?T=C6=B0=C6=A1ng=20th=C3=ADch=20Superbox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/admin.php b/admin.php
index d832508..4a907d7 100644
--- a/admin.php
+++ b/admin.php
@@ -195,7 +195,13 @@ public function admin_page_callback_settings() {
 
 			echo '<h1>Cập nhật thành công</h1><br>';
 		}
-		$option = get_option('nhymxu_at_coupon', ['uid' => '', 'utmsource' => '']);
+		$option = get_option('nhymxu_at_coupon', ['uid' => '', 'accesskey' => '', 'utmsource' => '']);
+		$uid = (isset($option['uid'])) ? $option['uid'] : '';
+		if( defined('NHYMXU_MARS_VERSION') && $uid == '' ) {
+			$uid = get_option('accesstrade_userid');
+			$option['uid'] = $uid;
+			update_option('nhymxu_at_coupon', $option);
+		}
 		?>
 		<script type="text/javascript">
 		function nhymxu_force_update_coupons() {
@@ -235,7 +241,7 @@ function nhymxu_force_update_merchants() {
 		<div>
 			<h2>Cài đặt ACCESSTRADE Coupon</h2>
 			<br>
-			<?php if( !isset($option['uid'], $option['accesskey']) ): ?>
+			<?php if( !isset($option['uid'], $option['accesskey']) || $option['uid'] == '' || $option['accesskey'] == '' ): ?>
 			<h3>Bạn cần nhập ACCESSTRADE ID và Access Key để plugin hoạt động tốt.</h3>
 			<br>
 			<?php endif; ?>
@@ -244,7 +250,7 @@ function nhymxu_force_update_merchants() {
 				<table>
 					<tr>
 						<td>ACCESSTRADE ID*:</td>
-						<td><input type="text" name="nhymxu_at_coupon_uid" value="<?=(isset($option['uid'])) ? $option['uid'] : '';?>"></td>
+						<td><input type="text" name="nhymxu_at_coupon_uid" value="<?=$uid;?>" <?=( defined('NHYMXU_MARS_VERSION') ) ? 'disabled' : '';?>></td>
 					</tr>
 					<tr>
 						<td></td>

From 4884976f4f0790530ad35d6d8140febeb9ca4938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C5=A9ng=20Nguy=E1=BB=85n?= <contact@dungnt.net>
Date: Tue, 12 Dec 2017 15:53:05 +0700
Subject: [PATCH 4/4] =?UTF-8?q?n=C3=A2ng=20phi=C3=AAn=20b=E1=BA=A3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nhymxu-at-coupon-pro.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nhymxu-at-coupon-pro.php b/nhymxu-at-coupon-pro.php
index 70e15b3..79b5390 100644
--- a/nhymxu-at-coupon-pro.php
+++ b/nhymxu-at-coupon-pro.php
@@ -4,12 +4,12 @@
 Plugin URI: http://github.com/nhymxu/accesstrade-coupon-pro
 Description: Pro version for ACCESSTRADE coupon
 Author: Dũng Nguyễn (nhymxu)
-Version: 0.1.0
+Version: 0.1.1
 Author URI: http://dungnt.net
 */
 
 defined( 'ABSPATH' ) || die;
-define('NHYMXU_AT_COUPON_PRO_VER', "0.1.0");
+define('NHYMXU_AT_COUPON_PRO_VER', "0.1.1");
 
 date_default_timezone_set('Asia/Ho_Chi_Minh');