deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Replace status with active in tables

Browse Source
This commit is contained in:
Deon George
2016-08-31 15:03:09 +10:00
parent 34e1e40f04
commit 54e4425aa8
51 changed files with 95 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/checkout/classes/Checkout/Plugin/Paypal.php
View File

@@ -62,7 +62,7 @@ abstract class Checkout_Plugin_Paypal extends Checkout_Plugin {
$debug_mode = Kohana::$config->load('debug')->checkout_notify;
// If testing
if (! $cno->status OR $cno->processed OR ($debug_mode AND Request::$client_ip == $this->ipn_test))
if (! $cno->active OR $cno->processed OR ($debug_mode AND Request::$client_ip == $this->ipn_test))
return _('Thank you');
$co = Cart::instance(isset($cno->data['custom']) ? $cno->data['custom'] : '');
@@ -200,14 +200,14 @@ abstract class Checkout_Plugin_Paypal extends Checkout_Plugin {
}
} else {
$cno->status = FALSE;
$cno->active = FALSE;
}
break;
case 'INVALID':
default:
$cno->status = FALSE;
$cno->active = FALSE;
}
if (! $debug_mode)

2
modules/checkout/classes/Controller/Checkout.php
View File

@@ -63,7 +63,7 @@ class Controller_Checkout extends Controller_TemplateDefault {
if (! $test_id) {
$cno->checkout_id = $co->id;
$cno->status = 1;
$cno->active = 1;
$cno->data = Request::current()->post();
$cno->save();

2
modules/checkout/classes/Task/Checkout/Notify/List.php
View File

@@ -21,7 +21,7 @@ class Task_Checkout_Notify_List extends Minion_Task {
$cno->display('date_orig'),
$cno->checkout_id,
$cno->checkout->name,
$cno->status ? 'A' : 'I',
$cno->active ? 'A' : 'I',
$cno->processed ? 'A' : 'I',
$cno->data['mc_gross'],
$cno->data['mc_fee'],