diff --git a/www/application/controllers/Paymnt.php b/www/application/controllers/Paymnt.php index 8352d2f6..8eb8565b 100644 --- a/www/application/controllers/Paymnt.php +++ b/www/application/controllers/Paymnt.php @@ -13,12 +13,26 @@ class Paymnt extends Users_Controller { } public function paymus() { - $data = $this->getSessionArray(); $data['card_table_result'] = $this->cardListData(4)['card_table_result']; - $this->RenderUserPage('users/view_startpaymus', $data); + $data['page_title'] ="Deposit Funds"; + // $this->RenderUserPage('users/view_startpaymus', $data); + $this->RenderUserPage('users/view_selectpay', $data); } + public function paycc() { + $data = $this->getSessionArray(); + $data['card_table_result'] = $this->cardListData(4)['card_table_result']; + $data['page_title'] ="Deposit Funds"; + $this->RenderUserPage('users/view_startpaymus', $data); + } + + public function paypal() { + $data = $this->getSessionArray(); + $data['card_table_result'] = $this->cardListData(4)['card_table_result']; + $data['page_title'] ="Deposit Funds"; + $this->RenderUserPage('users/view_paypal', $data); + } private function cardListData($limit){ diff --git a/www/application/views/users/view_balance.php b/www/application/views/users/view_balance.php index e127a086..535747a5 100644 --- a/www/application/views/users/view_balance.php +++ b/www/application/views/users/view_balance.php @@ -90,7 +90,7 @@ function getAddWithdrawButtons(){ break; case "AC_AD_FD_ONLY": - echo "Add Fund"; + echo "Depost Fund"; break; } diff --git a/www/application/views/users/view_paypal.php b/www/application/views/users/view_paypal.php new file mode 100644 index 00000000..e64c55a2 --- /dev/null +++ b/www/application/views/users/view_paypal.php @@ -0,0 +1,86 @@ + + + + +
+ +
+ +
+ +
+

+ Payment Methods +

+
+ PayPal +
+
+ + +
+ +
+ + +
+ + + +
+ + +
+ +
You will be transferred to the Paypal website to complete this transaction. +

+ You will require an existing Paypal account to complete this transaction.

+ +

PLEASE DO NOT CLOSE THE PAYPAL PAGE AFTER PAYMENT IS COMPLETED, you will be automatically re-directed back to your WrenchBoard account once payment is approved. If you close the page before this, your payment may not be properly credited. +
+ + +
+ + + +
+ + +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+ diff --git a/www/application/views/users/view_selectpay.php b/www/application/views/users/view_selectpay.php new file mode 100644 index 00000000..f5f11378 --- /dev/null +++ b/www/application/views/users/view_selectpay.php @@ -0,0 +1,121 @@ + + + + +
+
+
+
+

+ Please Select Payment Method +

+ +
+
+
+
+ + + +
+ +
+ +
+ +
+

+ PayPal +

+
+ +
+
+ + +
+
+ +
+
+
+ + +
+
+ Deposit +
+
+ +
+ +
+ + +
+ +
+ +
+

+ Credit Card +

+
+ +
+
+ + +
+
+ +
+
+
+ + +
+
+ Deposit +
+
+ +
+ +
+ + +
+ +
+ +
+

+ Bank Deposit +

+
+ +
+
+ + +
+
+ +
+
+
+ + +
+
+ Deposit +
+
+ +
+ +
+ +
+ diff --git a/www/application/views/users/view_startpaymus.php b/www/application/views/users/view_startpaymus.php index 60f65535..103b6ecb 100644 --- a/www/application/views/users/view_startpaymus.php +++ b/www/application/views/users/view_startpaymus.php @@ -1,5 +1,6 @@ +
@@ -152,7 +153,7 @@ - +
@@ -284,87 +285,3 @@ - - -
- -
- -
- -
-

- Payment Methods -

-
- PayPal -
-
- - -
- -
- - -
- - - -
- - -
- -
You will be transferred to the Paypal website to complete this transaction. -

- You will require an existing Paypal account to complete this transaction.

- -

PLEASE DO NOT CLOSE THE PAYPAL PAGE AFTER PAYMENT IS COMPLETED, you will be automatically re-directed back to your WrenchBoard account once payment is approved. If you close the page before this, your payment may not be properly credited. -
- - -
- - - -
- - -
- -
- -
- -
- -
- - -
- -
- -
- -
- -
- diff --git a/www/composer.json b/www/composer.json index d416a587..c5cef377 100644 --- a/www/composer.json +++ b/www/composer.json @@ -12,7 +12,7 @@ }, "require": { "php": ">=5.3.7", - "facebook/php-sdk-v4" : "~5.0", + "facebook/graph-sdk" : "^5.7", "firebase/php-jwt": "^5.5.1", "phpseclib/phpseclib": "^3.0", "hybridauth/hybridauth" : "~3.7.1", @@ -23,6 +23,6 @@ }, "require-dev": { "mikey179/vfsstream": "1.1.*", - "phpunit/phpunit": "4.* || 5.*" + "phpunit/phpunit": "^8" } }