Merge branch 'master' of bitbucket.org:venbainformationtechnology/golf_backend
This commit is contained in:
commit
b980946adf
@ -51,6 +51,7 @@ $routes->match(['get','post'],'/member_activate/(:any)','Member_controller::memb
|
||||
$routes->match(['get'],'/scheduler','Member_controller::scheduler');
|
||||
|
||||
$routes->get('/payment', 'PaymentController::index');
|
||||
$routes->get('/payment_success/(:any)', 'PaymentController::payment_success/$1');
|
||||
$routes->post('/payment/(:any)', 'PaymentController::index/$1');
|
||||
$routes->get('payment_form', 'PaymentController::payment_form');
|
||||
$routes->post('processPayment', 'PaymentController::processPayment');
|
||||
|
||||
@ -41,13 +41,14 @@ class PaymentController extends BaseController
|
||||
{
|
||||
if($this->request->getmethod() == 'post')
|
||||
{
|
||||
$count = $this->request->getVar('count');
|
||||
foreach ($count as $key => $value)
|
||||
{
|
||||
$this->Cart_token_model->where('id', $this->request->getVar('cart_token_id')[$key] )->set(array( 'count' => $value ))->update();
|
||||
}
|
||||
|
||||
if(!session()->has('logged_user'))
|
||||
{
|
||||
$count = $this->request->getVar('count');
|
||||
foreach ($count as $key => $value)
|
||||
{
|
||||
$this->Cart_token_model->where('id', $this->request->getVar('cart_token_id')[$key] )->set(array( 'count' => $value ))->update();
|
||||
}
|
||||
$this->session->set('token',$token);
|
||||
return redirect()->to(base_url());
|
||||
}
|
||||
@ -58,7 +59,7 @@ class PaymentController extends BaseController
|
||||
|
||||
} else {
|
||||
|
||||
return $this->payment_form();
|
||||
$this->payment_form();
|
||||
}
|
||||
}
|
||||
|
||||
@ -147,12 +148,12 @@ class PaymentController extends BaseController
|
||||
$data['userdata']=$this->dModel->getLoggedInMemberData(session()->get('logged_user'));
|
||||
|
||||
echo view('checkout',$data);
|
||||
// echo view('payment_form',$data);
|
||||
//echo view('payment_form',$data);
|
||||
} else { echo 'cart empty .. !'; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public function processPayment()
|
||||
{
|
||||
try {
|
||||
@ -209,13 +210,14 @@ class PaymentController extends BaseController
|
||||
$response = $payments_api->createPayment($create_payment_request);
|
||||
|
||||
if ($response->isSuccess()) {
|
||||
|
||||
|
||||
$data = json_encode($response->getResult());
|
||||
$result = json_decode( $data ,true);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
echo $result['payment']['id'];
|
||||
|
||||
$TrancactionId = $result['payment']['id'];
|
||||
$payment_order_id = $result['payment']['order_id'];
|
||||
$TrancactionData['member_id'] = session()->get('logged_user');
|
||||
@ -229,9 +231,9 @@ class PaymentController extends BaseController
|
||||
$this->cartModel->where('order_id', $order_id )->delete();
|
||||
}
|
||||
|
||||
echo json_encode($response->getResult());
|
||||
|
||||
echo json_encode($response->getResult());
|
||||
|
||||
|
||||
} else {
|
||||
echo json_encode(array('errors' => $response->getErrors()));
|
||||
}
|
||||
@ -260,7 +262,16 @@ class PaymentController extends BaseController
|
||||
|
||||
|
||||
|
||||
public function payment_success( $order_id = null)
|
||||
{
|
||||
if( $order_id != null)
|
||||
$memberCredits = $this->creditsModel->where('order_id', $order_id )->where('member_id', session()->get('logged_user'))->findAll();
|
||||
echo '<pre>';
|
||||
print_r($memberCredits);
|
||||
echo '</pre>';
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -33,6 +33,7 @@ class Test_controller extends BaseController
|
||||
}
|
||||
public function index($token = null)
|
||||
{
|
||||
|
||||
$count = $this->request->getVar('count');
|
||||
foreach ($count as $key => $value)
|
||||
{
|
||||
|
||||
@ -177,7 +177,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<div class="col-lg-4">
|
||||
<div class="col-lg-4 order-summary-main">
|
||||
<div class="order-summary">
|
||||
<div class="row order1">
|
||||
<div class="col-lg-12 col-12">
|
||||
@ -226,8 +226,8 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
|
||||
|
||||
|
||||
<?php include 'member_layout/footer.php' ?>
|
||||
<!-- <script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-ach.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-apple-pay.js"></script> -->
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-ach.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-apple-pay.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-google-pay.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-card-pay.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-payment-flow.js"></script>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
|
||||
<div class="col-lg-2"></div>
|
||||
|
||||
|
||||
|
||||
<div class="col-lg-1"></div>
|
||||
|
||||
@ -68,8 +68,8 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<!-- <script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-ach.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-apple-pay.js"></script> -->
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-ach.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-apple-pay.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-card-pay.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-google-pay.js"></script>
|
||||
<script type="text/javascript" src="<?= base_url(); ?>public/square-js/sq-payment-flow.js"></script>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user