Skip to content

Commit

Permalink
merged with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
cblach committed Nov 2, 2018
2 parents f3c2317 + cd363f0 commit c53b364
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions controllers/front/ping.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public function postProcess()
$myseq = (int)$seqobj['seq'];
if ((int)$ping['seq'] <= $myseq) {
SPDB_Seq::updatemtime($shopid);
echo json_encode([ 'success' => true ]);
return;
}

Expand Down
8 changes: 4 additions & 4 deletions scanpay.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
exit();
}

define('SCANPAY_VERSION', '0.1.2');
define('SCANPAY_VERSION', '0.1.3');

require_once(dirname(__FILE__) . '/classes/spdb.php');

Expand Down Expand Up @@ -88,8 +88,8 @@ public function hookPayment($params)
}

/* Handle the order confirmation page (post-payment) */
public function hookPaymentReturn($params)
{
public function hookPaymentReturn($params)
{
if (!isset($params['objOrder']) || ($params['objOrder']->module !== $this->name)) {
return false;
}
Expand Down Expand Up @@ -271,7 +271,7 @@ public function getContent()
];

foreach($settings as $key => $value) {
$helper->fields_value[$key] = $value;
$helper->fields_value[$key] = $value;
}
$helper->fields_value['pingurl'] = $this->context->link->getModuleLink($this->name, 'ping', [], true);

Expand Down

0 comments on commit c53b364

Please sign in to comment.