Skip to content

Commit 0d113fe

Browse files
sonyy-msonyy-m
authored
Merge pull request #7 from razorpay/update_sdk
Update PHP SDK to 2.8.3
2 parents 6ba958b + a428b56 commit 0d113fe

File tree

102 files changed

+3794
-2157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+3794
-2157
lines changed

‎includes/rzp-btn-action.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
use Razorpay\Api\Api;
34
use Razorpay\Api\Errors;
45
use Razorpay\PaymentButtonSiteOrigin\Errors as BtnErrors;

‎includes/rzp-btn-settings.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
require_once __DIR__.'/../templates/razorpay-settings-templates.php';
34

45
class RZP_Payment_Button_SiteOrigin_Setting
@@ -30,7 +31,7 @@ function razorpaySettings()
3031
$this->template->razorpaySettings();
3132
}
3233

33-
/**
34+
/**
3435
* Uses Settings API to create fields
3536
**/
3637
function displayOptions()

‎includes/rzp-btn-view.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
require_once __DIR__.'/../templates/razorpay-button-view-templates.php';
34

45
class RZP_View_Button_SiteOrigin

‎includes/rzp-payment-buttons.php

+44-39
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<?php
2-
if (! class_exists('WP_List_Table')) {
3-
require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
2+
3+
if (! class_exists('WP_List_Table'))
4+
{
5+
require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
46
}
57

6-
class RZP_Payment_Buttons_SiteOrigin extends WP_List_Table {
7-
8+
class RZP_Payment_Buttons_SiteOrigin extends WP_List_Table
9+
{
810
function __construct()
911
{
10-
parent::__construct(
12+
parent::__construct(
1113
array(
1214
'singular' => 'wp_list_text_link', //Singular label
1315
'plural' => 'wp_list_test_links', //plural label, also this well be one of the table css class
14-
'ajax' => false //does this table support ajax?
16+
'ajax' => false //does this table support ajax?
1517
)
1618
);
17-
}
19+
}
1820

1921
/**
2022
* Prepares buttons table and display
@@ -40,11 +42,11 @@ function rzp_buttons()
4042
</div>';
4143
}
4244

43-
/**
44-
* Add columns to grid view
45+
/**
46+
* Add columns to grid view
4547
* @return array
46-
*/
47-
function get_columns()
48+
*/
49+
function get_columns()
4850
{
4951
$columns = array(
5052
'title'=>__('Title'),
@@ -53,30 +55,28 @@ function get_columns()
5355
'created_at'=>__('Created At'),
5456
);
5557

56-
return $columns;
57-
}
58+
return $columns;
59+
}
5860

5961
/**
6062
* @param array|object $item
6163
* @param string $column_name
6264
* @return mixed|string|true|void
6365
*/
64-
function column_default($item, $column_name)
66+
function column_default($item, $column_name)
6567
{
66-
switch($column_name)
68+
switch($column_name)
6769
{
6870
case 'id':
6971
case 'title':
7072
case 'total_sales':
7173
case 'created_at':
7274
case 'status':
73-
return $item[ $column_name ];
74-
75+
return $item[$column_name];
7576
default:
76-
77-
return print_r($item, true) ; //Show the whole array for troubleshooting purposes
78-
}
79-
}
77+
return print_r($item, true) ; //Show the whole array for troubleshooting purposes
78+
}
79+
}
8080

8181
/**
8282
* @return array
@@ -93,22 +93,22 @@ protected function get_views()
9393
$views = array();
9494

9595
//All Buttons
96-
$class = ($current == 'all' ? ' class="current"' :'');
96+
$class = ($current === 'all' ? ' class="current"' :'');
9797
$all_url = remove_query_arg('status');
9898
$views['all'] = "<a href='{$all_url }' {$class} >All</a>";
9999

100100
//Active buttons
101101
$foo_url = add_query_arg('status','active');
102-
$class = ($current == 'active' ? ' class="current"' :'');
102+
$class = ($current === 'active' ? ' class="current"' :'');
103103
$views['status'] = "<a href='{$foo_url}' {$class} >Enabled</a>";
104104

105105
//Inactive buttons
106106
$bar_url = add_query_arg('status','inactive');
107-
$class = ($current == 'inactive' ? ' class="current"' :'');
107+
$class = ($current === 'inactive' ? ' class="current"' :'');
108108
$views['disabled'] = "<a href='{$bar_url}' {$class} >Disabled</a>";
109109

110110
return $views;
111-
}
111+
}
112112

113113
/**
114114
* @param $a
@@ -117,7 +117,8 @@ protected function get_views()
117117
*/
118118
function usort_reorder($a, $b)
119119
{
120-
if (isset($_GET['orderby']) && isset($_GET['order'])) {
120+
if (isset($_GET['orderby']) and isset($_GET['order']))
121+
{
121122
// If no sort, default to title
122123
$orderby = (!empty(sanitize_text_field($_GET['orderby']))) ? sanitize_text_field($_GET['orderby']) : 'title';
123124
// If no order, default to asc
@@ -135,8 +136,9 @@ function usort_reorder($a, $b)
135136
function get_sortable_columns()
136137
{
137138
$sortable_columns = array(
138-
'title' => array('title',false),
139+
'title' => array('title',false),
139140
);
141+
140142
return $sortable_columns;
141143
}
142144

@@ -164,11 +166,11 @@ function prepare_items()
164166

165167
if (1 < $current_page)
166168
{
167-
$offset = $per_page * ($current_page - 1);
169+
$offset = $per_page * ($current_page - 1);
168170
}
169171
else
170172
{
171-
$offset = 0;
173+
$offset = 0;
172174
}
173175

174176
//Retrieve $customvar for use in query to get items.
@@ -179,12 +181,12 @@ function prepare_items()
179181
$count = count($payment_page);
180182
$payment_pages = array();
181183

182-
for($i=0;$i<$count;$i++){
183-
184-
if($i >= $offset && $i < $offset+$per_page){
185-
$payment_pages[]=$payment_page[$i];
184+
for($i=0;$i<$count;$i++)
185+
{
186+
if($i >= $offset and $i < $offset+$per_page)
187+
{
188+
$payment_pages[] = $payment_page[$i];
186189
}
187-
188190
}
189191

190192
$columns = $this->get_columns();
@@ -196,11 +198,13 @@ function prepare_items()
196198
$this->items = $payment_pages;
197199

198200
// Set the pagination
199-
$this->set_pagination_args(array(
200-
'total_items' => $count,
201-
'per_page' => $per_page,
202-
'total_pages' => ceil($count / $per_page)
203-
) );
201+
$this->set_pagination_args(
202+
array(
203+
'total_items' => $count,
204+
'per_page' => $per_page,
205+
'total_pages' => ceil($count / $per_page)
206+
)
207+
);
204208
}
205209

206210
/**
@@ -241,6 +245,7 @@ function get_items($status, $count)
241245
);
242246
}
243247
}
248+
244249
return $items;
245250
}
246251
}

‎includes/rzp-subscription-buttons.php

+26-22
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?php
2-
if(! class_exists('WP_List_Table')) {
3-
require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
2+
3+
if(! class_exists('WP_List_Table'))
4+
{
5+
require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
46
}
57

68
/**
79
* Class RZP_Subscription_Buttons_SiteOrigin
810
*/
9-
class RZP_Subscription_Buttons_SiteOrigin extends WP_List_Table {
10-
11+
class RZP_Subscription_Buttons_SiteOrigin extends WP_List_Table
12+
{
1113
function __construct()
1214
{
1315
parent::__construct(
@@ -49,7 +51,6 @@ function subscription_buttons()
4951
*/
5052
function get_columns()
5153
{
52-
5354
$columns = array(
5455
'title'=>__('Title'),
5556
'total_sales'=>__('Total Sales'),
@@ -70,10 +71,8 @@ function column_default($item, $column_name)
7071
case 'created_at':
7172
case 'status':
7273
return $item[ $column_name ];
73-
7474
default:
75-
76-
return print_r($item, true) ; //Show the whole array for troubleshooting purposes
75+
return print_r($item, true) ; //Show the whole array for troubleshooting purposes
7776
}
7877
}
7978

@@ -89,18 +88,18 @@ protected function get_views()
8988
$views = array();
9089

9190
//All Buttons
92-
$class = ($current == 'all' ? ' class="current"' :'');
91+
$class = ($current === 'all' ? ' class="current"' :'');
9392
$all_url = remove_query_arg('status');
9493
$views['all'] = "<a href='{$all_url }' {$class} >All</a>";
9594

9695
//Active buttons
9796
$foo_url = add_query_arg('status','active');
98-
$class = ($current == 'active' ? ' class="current"' :'');
97+
$class = ($current === 'active' ? ' class="current"' :'');
9998
$views['status'] = "<a href='{$foo_url}' {$class} >Enabled</a>";
10099

101100
//Inactive buttons
102101
$bar_url = add_query_arg('status','inactive');
103-
$class = ($current == 'inactive' ? ' class="current"' :'');
102+
$class = ($current === 'inactive' ? ' class="current"' :'');
104103
$views['disabled'] = "<a href='{$bar_url}' {$class} >Disabled</a>";
105104

106105
return $views;
@@ -114,7 +113,7 @@ protected function get_views()
114113
*/
115114
function usort_reorder($a, $b)
116115
{
117-
if(isset($_GET['orderby']) && isset($_GET['order']))
116+
if(isset($_GET['orderby']) and isset($_GET['order']))
118117
{
119118
// If no sort, default to title
120119
$orderby = (! empty(sanitize_text_field($_GET['orderby']))) ? sanitize_text_field($_GET['orderby']) : 'title';
@@ -125,7 +124,6 @@ function usort_reorder($a, $b)
125124
// Send final sort direction to usort
126125
return ($order === 'asc') ? $result : -$result;
127126
}
128-
129127
}
130128

131129
/**
@@ -134,8 +132,9 @@ function usort_reorder($a, $b)
134132
function get_sortable_columns()
135133
{
136134
$sortable_columns = array(
137-
'title' => array('title',false),
135+
'title' => array('title',false),
138136
);
137+
139138
return $sortable_columns;
140139
}
141140

@@ -178,9 +177,11 @@ function prepare_items()
178177
$count = count($payment_page);
179178
$payment_pages = array();
180179

181-
for($i=0;$i<$count;$i++){
182-
if($i >= $offset && $i < $offset+$per_page){
183-
$payment_pages[]=$payment_page[$i];
180+
for($i=0;$i<$count;$i++)
181+
{
182+
if($i >= $offset and $i < $offset+$per_page)
183+
{
184+
$payment_pages[] = $payment_page[$i];
184185
}
185186
}
186187

@@ -193,11 +194,13 @@ function prepare_items()
193194
$this->items = $payment_pages;
194195

195196
// Set the pagination
196-
$this->set_pagination_args(array(
197-
'total_items' => $count,
198-
'per_page' => $per_page,
199-
'total_pages' => ceil($count / $per_page)
200-
) );
197+
$this->set_pagination_args(
198+
array(
199+
'total_items' => $count,
200+
'per_page' => $per_page,
201+
'total_pages' => ceil($count / $per_page)
202+
)
203+
);
201204
}
202205

203206
/**
@@ -238,6 +241,7 @@ function get_items($status, $count)
238241
);
239242
}
240243
}
244+
241245
return $items;
242246
}
243247
}

0 commit comments

Comments
 (0)