Skip to content

Commit

Permalink
https://github.com/opencart/opencart/issues/12661
Browse files Browse the repository at this point in the history
  • Loading branch information
danielkerr committed Apr 4, 2024
1 parent b87584b commit 1f050a7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
14 changes: 7 additions & 7 deletions upload/admin/view/template/sale/order_info.twig
Expand Up @@ -2092,7 +2092,7 @@ $('#input-payment-address').on('change', function() {
var element = this;
$.ajax({
url: 'index.php?route=customer/customer.address&user_token={{ user_token }}&address_id=' + this.value,
url: 'index.php?route=customer/address.address&user_token={{ user_token }}&address_id=' + this.value,
dataType: 'json',
beforeSend: function() {
$(element).prop('disabled', true);
Expand Down Expand Up @@ -2263,7 +2263,7 @@ $('#input-shipping-address').on('change', function() {
var element = this;
$.ajax({
url: 'index.php?route=customer/customer.address&user_token={{ user_token }}&address_id=' + this.value,
url: 'index.php?route=customer/address.address&user_token={{ user_token }}&address_id=' + this.value,
dataType: 'json',
beforeSend: function() {
$(element).prop('disabled', true);
Expand Down Expand Up @@ -2347,23 +2347,23 @@ $('#form-shipping-address').on('submit', function(e) {
if (json['success']) {
$('#form-shipping-address').prepend('<div class="alert alert-success alert-dismissible"><i class="fa-solid fa-check-circle"></i> ' + json['success'] + ' <button type="button" class="btn-close" data-bs-dismiss="alert"></button></div>');
var address = $('#input-shipping-firstname').val() + ' ' + $('#input-shipping-lastname').val() + "<br/>";
var address = $('#input-shipping-firstname').val() + ' ' + $('#input-shipping-lastname').val() + '<br/>';
var company = $('#input-shipping-company').val();
if (company) {
address += $('#input-shipping-company').val() + "<br/>";
address += $('#input-shipping-company').val() + '<br/>';
}
address += $('#input-shipping-address-1').val() + "<br/>";
address += $('#input-shipping-address-1').val() + '<br/>';
var address_2 = $('#input-shipping-address-2').val();
if (address_2) {
address += $('#input-shipping-address-2').val() + "<br/>";
address += $('#input-shipping-address-2').val() + '<br/>';
}
address += $('#input-shipping-city').val() + "<br/>";
address += $('#input-shipping-city').val() + '<br/>';
var postcode = $('#input-shipping-postcode').val();
Expand Down
3 changes: 3 additions & 0 deletions upload/catalog/controller/api/sale/cart.php
Expand Up @@ -178,6 +178,9 @@ public function add(): void {
if (!$json) {
$this->cart->add($product_id, $quantity, $option, $subscription_plan_id);

print_r($this->cart->getProducts());


$json['success'] = $this->language->get('text_success');
}

Expand Down
4 changes: 2 additions & 2 deletions upload/catalog/controller/api/sale/order.php
Expand Up @@ -727,9 +727,9 @@ public function delete(): void {
$selected[] = (int)$this->request->get['order_id'];
}

foreach ($selected as $order_id) {
$this->load->model('checkout/order');
$this->load->model('checkout/order');

foreach ($selected as $order_id) {
$order_info = $this->model_checkout_order->getOrder($order_id);

if ($order_info) {
Expand Down

0 comments on commit 1f050a7

Please sign in to comment.