From 35667e94596f44625f5a4db1dc00a17a009d7e98 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Tue, 13 Dec 2022 15:14:27 +0700 Subject: [PATCH 1/7] Fix registration info --- ui/ui/register-otp.tpl | 2 +- ui/ui/register-rotp.tpl | 2 +- ui/ui/register.tpl | 2 +- ui/ui/user-login.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/ui/register-otp.tpl b/ui/ui/register-otp.tpl index 4805ea6..917f102 100644 --- a/ui/ui/register-otp.tpl +++ b/ui/ui/register-otp.tpl @@ -32,7 +32,7 @@
{$_L['Registration_Info']}
-
+
{include file="$_path/../pages/Registration_Info.html"}
diff --git a/ui/ui/register-rotp.tpl b/ui/ui/register-rotp.tpl index e24b6c7..d01cca0 100644 --- a/ui/ui/register-rotp.tpl +++ b/ui/ui/register-rotp.tpl @@ -46,7 +46,7 @@
{$_L['Registration_Info']}
-
+
{include file="$_path/../pages/Registration_Info.html"}
diff --git a/ui/ui/register.tpl b/ui/ui/register.tpl index f56d91b..8e88d9d 100644 --- a/ui/ui/register.tpl +++ b/ui/ui/register.tpl @@ -32,7 +32,7 @@
{$_L['Registration_Info']}
-
+
{include file="$_path/../pages/Registration_Info.html"}
diff --git a/ui/ui/user-login.tpl b/ui/ui/user-login.tpl index 989f691..2eba41c 100644 --- a/ui/ui/user-login.tpl +++ b/ui/ui/user-login.tpl @@ -31,7 +31,7 @@
{$_L['Announcement']}
-
+
{include file="$_path/../pages/Announcement.html"}
From 660f1860043055bb02a21e26f51c094ee667be06 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Wed, 14 Dec 2022 15:08:14 +0700 Subject: [PATCH 2/7] WhatsappGateway Info --- ui/ui/community.tpl | 51 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/ui/ui/community.tpl b/ui/ui/community.tpl index 6c6b92f..bbf9d84 100644 --- a/ui/ui/community.tpl +++ b/ui/ui/community.tpl @@ -3,7 +3,9 @@
-

Discussions

+
+

Discussions

+
Get help from community
-

Feedback

+
+

Feedback

+
Feedback and Bug Report
@@ -28,7 +32,9 @@
-

Donasi

+
+

Donasi

+
Untuk pengembangan lebih baik, donasi ke iBNuX, donasi akan membantu terus pengembangan aplikasi
@@ -59,7 +65,9 @@
-

Donations

+
+

Donations

+
Donations will help to continue phpnuxbill development
@@ -94,7 +102,9 @@
-

Chat with me

+
+

Chat with me

+
Paid Support?
donation confirmation?
Or ask any Donation Alternative
Telegram @@ -108,26 +118,43 @@
-

PHPNUXBILL

+
+

PHPNUXBILL

+
{$_L['Welcome_Text_Admin']}
- Get Latest Version + Get Latest Version +
+
+
+
+

Free WhatsApp Gateway and Telegram Bot creater

+
+
+ There is a Telegram bot wizard in here +
+
+ wa.nux.my.id
{include file="sections/footer.tpl"} \ No newline at end of file From 376a3448b6c10074fa5f62b26fc905ae801f5014 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Wed, 14 Dec 2022 15:08:23 +0700 Subject: [PATCH 3/7] add postData --- system/autoload/Http.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/system/autoload/Http.php b/system/autoload/Http.php index 0fd4da2..e4b1982 100644 --- a/system/autoload/Http.php +++ b/system/autoload/Http.php @@ -40,4 +40,26 @@ class Http curl_close($ch); return $server_output; } + + + public static function postData($url, $array_post, $headers = [], $basic = null) + { + $headers[] = 'Content-Type: application/x-www-form-urlencoded'; + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15); + curl_setopt($ch, CURLOPT_TIMEOUT, 15); + curl_setopt($ch, CURLOPT_VERBOSE, false); + curl_setopt($ch, CURLINFO_HEADER_OUT, false); + curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_post)); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + if (!empty($basic)) { + curl_setopt($ch, CURLOPT_USERPWD, $basic); + } + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + $server_output = curl_exec($ch); + curl_close($ch); + return $server_output; + } } From f3363856f3d67e405e167a26408c09337f73c91d Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Wed, 14 Dec 2022 15:08:42 +0700 Subject: [PATCH 4/7] Check user email and Desc History --- system/controllers/order.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/controllers/order.php b/system/controllers/order.php index db4b567..3cc1622 100644 --- a/system/controllers/order.php +++ b/system/controllers/order.php @@ -19,6 +19,7 @@ switch ($action) { $ui->assign('_system_menu', 'history'); $d = ORM::for_table('tbl_payment_gateway') ->where('username', $user['username']) + ->order_by_desc('id') ->find_many(); $paginator = Paginator::bootstrap('tbl_payment_gateway', 'username', $user['username']); $ui->assign('paginator', $paginator); @@ -28,6 +29,9 @@ switch ($action) { $ui->display('user-orderHistory.tpl'); break; case 'package': + if(empty($user['email'])){ + r2(U . 'accounts/profile', 'e', Lang::T("Please enter your email address")); + } $ui->assign('_title', 'Order Plan'); $ui->assign('_system_menu', 'package'); $routers = ORM::for_table('tbl_routers')->find_many(); @@ -102,6 +106,9 @@ switch ($action) { $ui->display('user-orderView.tpl'); break; case 'buy': + if(empty($user['email'])){ + r2(U . 'accounts/profile', 'e', Lang::T("Please enter your email address")); + } if ($config['payment_gateway'] == 'none') { r2(U . 'home', 'e', Lang::T("No Payment Gateway Available")); } From ada4bc8b516262abd622029bf94013a1cb5d209f Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Wed, 14 Dec 2022 15:08:49 +0700 Subject: [PATCH 5/7] add translation --- system/lan/indonesia/common.lan.php | 2 ++ ui/ui/app-settings.tpl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/system/lan/indonesia/common.lan.php b/system/lan/indonesia/common.lan.php index a3710af..fe3ad38 100644 --- a/system/lan/indonesia/common.lan.php +++ b/system/lan/indonesia/common.lan.php @@ -304,3 +304,5 @@ $_L['Will_show_below_user_pages'] = 'Will show below user pages'; $_L['Request_OTP'] = 'Request OTP'; $_L['Verification_Code'] = 'Verification Code'; $_L['SMS_Verification_Code'] = 'SMS Verification Code'; +$_L['Please_enter_your_email_address'] = 'Please enter your email address'; +$_L['Failed_to_create_Paypal_transaction'] = 'Failed to create Paypal transaction.'; diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index de141b9..c753924 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -73,6 +73,7 @@ value="{$_c['telegram_target_id']}" placeholder="12345678">
+ You will get Payment and Error notification
SMS OTP Registration
@@ -85,6 +86,7 @@

+ You can use WhatsApp in here too. Free Server
Whatsapp Notification
From 51b5dbd6f71b51930ac19943fd4dad9f7b96b5c5 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Wed, 14 Dec 2022 15:18:39 +0700 Subject: [PATCH 6/7] Version 2022.12.14 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index e59d54b..f5b39cc 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "6.1.2" + "version": "2022.12.14" } \ No newline at end of file From b69552b44a0673524d77a73372c26f96e6118106 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Wed, 14 Dec 2022 15:22:30 +0700 Subject: [PATCH 7/7] add sponsors --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f59b003..5b66ca2 100644 --- a/README.md +++ b/README.md @@ -89,4 +89,5 @@ a.n Ibnu Maksum ## SPONSORS -none :( +- [mlink.id](https://mlink.id) +- [https://github.com/sonyinside](https://github.com/sonyinside)