Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

538
  
545
  
545
  
order.php
_> 11 <?php
  22 /*
<> 3 -  $Id: order.php 538 2006-04-27 16:53:59Z hpdl $
   3+  $Id: order.php 545 2006-04-28 14:04:49Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
      
 !
 
…
145145       $Qorder->bindValue(':billing_city', $osC_ShoppingCart->getBillingAddress('city'));
  146146       $Qorder->bindValue(':billing_postcode', $osC_ShoppingCart->getBillingAddress('postcode'));
  147147       $Qorder->bindValue(':billing_state', $osC_ShoppingCart->getBillingAddress('state'));
<> 148 -      $Qorder->bindValue(':billing_country', $osC_ShoppingCart->getBillingAddress('country_id'));
   148+      $Qorder->bindValue(':billing_country', $osC_ShoppingCart->getBillingAddress('country_title'));
149149       $Qorder->bindInt(':billing_address_format_id', $osC_ShoppingCart->getBillingAddress('format_id'));
  150150       $Qorder->bindValue(':payment_method', $osC_ShoppingCart->getBillingMethod('title'));
  151151       $Qorder->bindValue(':payment_module', $GLOBALS['osC_Payment_' . $osC_ShoppingCart->getBillingMethod('id')]->getCode());
      
 !
 
…
356356                        sprintf($osC_Language->get('email_order_invoice_url'), tep_href_link(FILENAME_ACCOUNT, 'orders=' . $id, 'SSL', false, true, true)) . "\n" .
  357357                        sprintf($osC_Language->get('email_order_date_ordered'), osC_DateTime::getLong()) . "\n\n";
  358358 
<> 359 -        if (isset($_SESSION['comments'])) {
  360 -          $email_order .= tep_output_string_protected($_SESSION['comments']) . "\n\n";
  361 -        }
  362 -
363359         $Qproducts = $osC_Database->query('select products_model, products_name, final_price, products_tax, products_quantity from :table_orders_products where orders_id = :orders_id order by orders_products_id');
  364360         $Qproducts->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS);
  365361         $Qproducts->bindInt(':orders_id', $id);
      
 !
 
…
371367           $products_ordered .= $Qproducts->valueInt('products_quantity') . ' x ' . $Qproducts->value('products_name') . ' (' . $Qproducts->value('products_model') . ') = ' . $osC_Currencies->displayPriceWithTaxRate($Qproducts->value('final_price'), $Qproducts->value('products_tax'), $Qproducts->valueInt('products_quantity'), $Qorder->value('currency'), $Qorder->value('currency_value')) . "\n"; // . $products_ordered_attributes . "\n";
  372368         }
  373369 
<>  370+        unset($Qproducts);
   371+
374372         $email_order .= $osC_Language->get('email_order_products') . "\n" .
  375373                         $osC_Language->get('email_order_separator') . "\n" .
  376374                         $products_ordered .
      
 !
 
…
385383           $email_order .= strip_tags($Qtotals->value('title') . ' ' . $Qtotals->value('text')) . "\n";
  386384         }
  387385 
<> 388 -//        if ($order->content_type != 'virtual') {
  389 -//          $email_order .= "\n" . $osC_Language->get('email_order_delivery_address') . "\n" .
  390 -//                          $osC_Language->get('email_order_separator') . "\n" .
  391 -//                          tep_address_label($osC_Customer->getID(), $osC_ShoppingCart->getShippingAddress('id'), 0, '', "\n") . "\n";
  392 -//        }
   386+        unset($Qtotals);
393387 
<> 394 -//        $email_order .= "\n" . $osC_Language->get('email_order_billing_address') . "\n" .
  395 -//                        $osC_Language->get('email_order_separator') . "\n" .
  396 -//                        tep_address_label($osC_Customer->getID(), $osC_ShoppingCart->getBillingAddress('id'), 0, '', "\n") . "\n\n";
   388+        if ( (osc_empty($Qorder->value('delivery_name') === false)) && (osc_empty($Qorder->value('street_address') === false)) ) {
   389+          $address = array('name' => $Qorder->value('delivery_name'),
   390+                           'company' => $Qorder->value('delivery_company'),
   391+                           'street_address' => $Qorder->value('delivery_street_address'),
   392+                           'suburb' => $Qorder->value('delivery_suburb'),
   393+                           'city' => $Qorder->value('delivery_city'),
   394+                           'state' => $Qorder->value('delivery_state'),
   395+                           'country' => $Qorder->value('delivery_country'),
   396+                           'postcode' => $Qorder->value('delivery_postcode'));
397397 
<>  398+          $email_order .= "\n" . $osC_Language->get('email_order_delivery_address') . "\n" .
   399+                          $osC_Language->get('email_order_separator') . "\n" .
   400+                          tep_address_format($Qorder->valueInt('delivery_address_format_id'), $address, false, '', "\n") . "\n";
   401+
   402+          unset($address);
   403+        }
   404+
   405+        $address = array('name' => $Qorder->value('billing_name'),
   406+                         'company' => $Qorder->value('billing_company'),
   407+                         'street_address' => $Qorder->value('billing_street_address'),
   408+                         'suburb' => $Qorder->value('billing_suburb'),
   409+                         'city' => $Qorder->value('billing_city'),
   410+                         'state' => $Qorder->value('billing_state'),
   411+                         'country' => $Qorder->value('billing_country'),
   412+                         'postcode' => $Qorder->value('billing_postcode'));
   413+
   414+        $email_order .= "\n" . $osC_Language->get('email_order_billing_address') . "\n" .
   415+                        $osC_Language->get('email_order_separator') . "\n" .
   416+                        tep_address_format($Qorder->valueInt('billing_address_format_id'), $address, false, '', "\n") . "\n\n";
   417+
   418+        unset($address);
   419+
   420+        $Qstatus = $osC_Database->query('select orders_status_name from :table_orders_status where orders_status_id = :orders_status_id and language_id = :language_id');
   421+        $Qstatus->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
   422+        $Qstatus->bindInt(':orders_status_id', $Qorder->valueInt('orders_status'));
   423+        $Qstatus->bindInt(':language_id', $osC_Language->getID());
   424+        $Qstatus->execute();
   425+
   426+        $email_order .= sprintf($osC_Language->get('email_order_status'), $Qstatus->value('orders_status_name')) . "\n" .
   427+                        $osC_Language->get('email_order_separator') . "\n";
   428+
   429+        unset($Qstatus);
   430+
   431+        $Qstatuses = $osC_Database->query('select date_added, comments from :table_orders_status_history where orders_id = :orders_id and comments != "" order by orders_status_history_id');
   432+        $Qstatuses->bindTable(':table_orders_status_history', TABLE_ORDERS_STATUS_HISTORY);
   433+        $Qstatuses->bindInt(':orders_id', $id);
   434+        $Qstatuses->execute();
   435+
   436+        while ($Qstatuses->next()) {
   437+          $email_order .= osC_DateTime::getLong($Qstatuses->value('date_added')) . "\n\t" . wordwrap($Qstatuses->value('comments'), 60, "\n\t", 1) . "\n\n";
   438+        }
   439+
   440+        unset($Qstatuses);
   441+
398442 //        if (is_object($GLOBALS[$payment])) {
  399443 //          $email_order .= $osC_Language->get('email_order_payment_method') . "\n" .
  400444 //                          $osC_Language->get('email_order_separator') . "\n";
      
 !
 
…
412456           tep_mail('', SEND_EXTRA_ORDER_EMAILS_TO, $osC_Language->get('email_order_subject'), $email_order, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
  413457         }
  414458       }
<>  459+
   460+      unset($Qorder);
<_ 415461     }
  416462 
  417463     function &getListing($limit = null, $page_keyword = 'page') {