Skip to content

Commit

Permalink
Merge branch 'v2.3-dev' into 'v2.3-master'
Browse files Browse the repository at this point in the history
V2.3 dev



See merge request !35
masonpham committed Nov 15, 2018
2 parents a82e566 + f166ac7 commit 828c9bd
Showing 2 changed files with 1 addition and 1 deletion.
Binary file modified src/admin/view/image/payment/paymentwall_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/catalog/controller/checkout/pingback.php
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ public function index()
$this->getCheckoutOrderModel()->addOrderHistory($order['order_id'], $defaultConfigs['config_order_status_id'], '', true);
}

if ($pingback->validate()) {
if ($pingback->validate(true)) {
if ($pingback->isDeliverable()) {
$this->getPaymentModel()->callDeliveryApi($order, $pingback->getReferenceId());
if ($order['order_status_id'] != $this->config->get($order['payment_code'] . '_complete_status')) {

0 comments on commit 828c9bd

Please sign in to comment.