# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: lyle@phosphor-20090701155051-1n2h9ny18ijx6kxn # target_branch: bzr+ssh://lyle.mantooth@bazaar.ubercart.org/bzr\ # /drupal6/ubercart # testament_sha1: c66b14b2da90f314eaadcaee20b5cdb4183400ce # timestamp: 2009-07-01 11:52:08 -0400 # source_branch: bzr://bazaar.ubercart.org/bzr/drupal6/ubercart # base_revision_id: ryan@ubercart.org-20090629202445-nll42fyxuqtxjw7k # # Begin patch === modified file 'payment/uc_2checkout/uc_2checkout.module' --- payment/uc_2checkout/uc_2checkout.module 2009-05-09 17:44:11 +0000 +++ payment/uc_2checkout/uc_2checkout.module 2009-07-01 15:50:51 +0000 @@ -182,6 +182,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => '2checkout-form', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -212,6 +213,7 @@ ); $i = 0; + $context['type'] = 'order_product'; foreach ($order->products as $product) { $i++; $data['c_prod_'. $i] = $product->model .','. $product->qty; === modified file 'payment/uc_authorizenet/uc_authorizenet.module' --- payment/uc_authorizenet/uc_authorizenet.module 2009-04-28 16:54:42 +0000 +++ payment/uc_authorizenet/uc_authorizenet.module 2009-07-01 15:50:51 +0000 @@ -338,6 +338,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'cim-profile-charge', + 'type' => 'amount', ); $comment[] = t('@type: @amount', array('@type' => $types[$data['txn_type']], '@amount' => uc_price($amount, $context))); @@ -431,6 +432,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'authorize.net-charge', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -601,6 +603,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'authorize.net-charge-comment', + 'type' => 'amount', ); $comment = t('@type
@status: @message
Amount: @amount
AVS response: @avs', array('@type' => _uc_authorizenet_txn_type($response[11]), '@status' => $result['success'] ? t('ACCEPTED') : t('REJECTED'), '@message' => $response[3], '@amount' => uc_price($response[9], $context), '@avs' => _uc_authorizenet_avs($response[5]))); === modified file 'payment/uc_credit/test_gateway.module' --- payment/uc_credit/test_gateway.module 2009-04-18 01:03:01 +0000 +++ payment/uc_credit/test_gateway.module 2009-07-01 15:50:51 +0000 @@ -48,6 +48,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'test-gateway-charge-comment', + 'type' => 'amount', ); $message = t('Credit card charged: !amount', array('!amount' => uc_price($amount, $context))); uc_order_comment_save($order_id, $user->uid, $message, 'admin'); === modified file 'payment/uc_credit/uc_credit.admin.inc' --- payment/uc_credit/uc_credit.admin.inc 2009-04-28 16:54:42 +0000 +++ payment/uc_credit/uc_credit.admin.inc 2009-07-01 15:50:51 +0000 @@ -20,9 +20,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'credit-card-terminal', - 'subject' => array( - 'order' => $order, - ), + 'type' => 'amount', ); $output .= '
'. t('Order total: @total', array('@total' => uc_price($order->order_total, $context))) .'
' .'
'. t('Balance: @balance', array('@balance' => uc_price(uc_payment_balance($order), $context))) .'
'; @@ -48,6 +46,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'credit-card-form', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, === modified file 'payment/uc_cybersource/uc_cybersource.module' --- payment/uc_cybersource/uc_cybersource.module 2009-06-29 19:07:54 +0000 +++ payment/uc_cybersource/uc_cybersource.module 2009-07-01 15:50:51 +0000 @@ -221,6 +221,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'cybersource-charge', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -383,6 +384,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'cybersource-post-charge', + 'type' => 'amount', ); $o_comment = t('Credit card !type: !amount
Decision: @decision
Reason: !reason', array('!type' => variable_get('uc_cybersource_transaction_type', 'sale'), '!amount' => uc_price($nvp['orderAmount'], $context), '@decision' => $nvp['decision'], '!reason' => _parse_cs_reason_code($nvp['reasonCode']))); $p_comment = t('!id
!decision, Reason: !reason', array('!id' => $nvp['orderPage_serialNumber'], '!decision' => $nvp['decision'], '!reason' => $nvp['reasonCode'])); @@ -610,6 +612,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'cybersource-soap-charge', + 'type' => 'amount', ); $o_comment = t('@type: @amount
Decision: @decision
Reason: !reason', array('@type' => $types[$data['txn_type']], '@amount' => uc_price($amount, $context), '@decision' => $reply->decision, '!reason' => _parse_cs_reason_code($reply->reasonCode))); $p_comment = t('@type:
@id
@decision, Reason: !reason', array('@type' => $types[$data['txn_type']], '@id' => $reply->requestID, '@decision' => $reply->decision, '!reason' => $reply->reasonCode)); @@ -695,6 +698,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'cybersource-tax-test', + 'type' => 'line_item', ); // Build an item list for the taxes. @@ -914,6 +918,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'cybersource-calculate-tax', + 'type' => 'amount', ); watchdog('uc_cybersource', 'Tax calculation produced uneven results. Expected a total of @total, received the following: @dump', array('@total' => uc_price($reply->taxReply->totalTaxAmount, $context), '@dump' => '
'. print_r($result, TRUE) .'
'), WATCHDOG_ERROR); === modified file 'payment/uc_google_checkout/uc_google_checkout.admin.inc' --- payment/uc_google_checkout/uc_google_checkout.admin.inc 2009-06-15 19:18:41 +0000 +++ payment/uc_google_checkout/uc_google_checkout.admin.inc 2009-07-01 15:50:51 +0000 @@ -315,6 +315,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'google-checkout-terminal', + 'type' => 'amount', ); $output .= '

'. t('Use this terminal to process credit card payments:') .'

' .'' @@ -368,6 +369,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'google-checkout-terminal-form', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, === modified file 'payment/uc_google_checkout/uc_google_checkout.module' --- payment/uc_google_checkout/uc_google_checkout.module 2009-06-22 18:24:47 +0000 +++ payment/uc_google_checkout/uc_google_checkout.module 2009-07-01 15:50:51 +0000 @@ -500,6 +500,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'google-checkout-cart-request', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -938,6 +939,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'google-checkout-charge-comment', + 'type' => 'amount', ); uc_order_comment_save($order_id, 0, t('Payment of %amount received by Google Checkout.', array('%amount' => uc_price($charge->{'latest-charge-amount'}, $context))), 'admin', 'chargeable'); uc_google_checkout_notification_acknowledgement($charge['serial-number']); @@ -973,6 +975,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'google-checkout-refund-comment', + 'type' => 'amount', ); uc_order_comment_save($order_id, 0, t('Refund of %amount received by Google Checkout.', array('%amount' => uc_price($refund->{'latest-refund-amount'}, $context))), 'admin', 'processing'); === modified file 'payment/uc_payment/uc_payment.admin.inc' --- payment/uc_payment/uc_payment.admin.inc 2009-05-06 18:27:07 +0000 +++ payment/uc_payment/uc_payment.admin.inc 2009-07-01 15:50:51 +0000 @@ -300,16 +300,14 @@ $context = array( 'revision' => 'themed-original', 'location' => 'order-payments-admin', - 'subject' => array(), - 'extras' => array( - 'order' => $order, - ), + 'type' => 'amount', ); $form['order_total'] = array('#value' => uc_price($total, $context)); $form['payments'] = tapir_get_table('uc_payments_table'); if ($payments !== FALSE) { foreach ($payments as $payment) { + $context['type'] = 'payment'; $context['subject']['payment'] = $payment; $form['payments'][$payment->receipt_id]['#attributes'] = array('valign' => 'top'); $form['payments'][$payment->receipt_id]['received'] = array( @@ -326,6 +324,7 @@ ); $total -= $payment->amount; unset($context['subject']['payment']); + $context['type'] = 'amount'; $context['subject']['total'] = $total; $form['payments'][$payment->receipt_id]['balance'] = array( '#value' => uc_price($total, $context, array('cache' => FALSE)), @@ -427,6 +426,7 @@ $context = array( 'revision' => 'formatted', 'location' => 'payment-delete', + 'type' => 'payment', 'subject' => array( 'payment' => $payment, ), === modified file 'payment/uc_payment/uc_payment.ca.inc' --- payment/uc_payment/uc_payment.ca.inc 2009-04-18 01:05:58 +0000 +++ payment/uc_payment/uc_payment.ca.inc 2009-07-01 15:50:51 +0000 @@ -179,6 +179,7 @@ $context = array( 'revision' => 'formatted', 'location' => 'zero-balance', + 'type' => 'amount', ); $zero = array('!zero' => uc_price(0, $context)); $options = array( === modified file 'payment/uc_payment/uc_payment.module' --- payment/uc_payment/uc_payment.module 2009-04-18 01:18:43 +0000 +++ payment/uc_payment/uc_payment.module 2009-07-01 15:50:51 +0000 @@ -145,6 +145,7 @@ $context = array( 'revision' => 'formatted', 'location' => 'payment-balance-token', + 'type' => 'amount', ); $values['order-payment-balance'] = uc_price(uc_payment_balance($order), $context); break; @@ -332,7 +333,9 @@ $grand_total = 0; $context = array( + 'revision' => 'themed', 'location' => 'checkout-order-total-preview', + 'type' => 'line_item', ); foreach ($totals as $line) { @@ -348,6 +351,7 @@ } } + $context['type'] = 'amount'; $context['subject'] = array( 'grand_total' => $grand_total, ); @@ -584,6 +588,7 @@ $context = array( 'revision' => 'formatted', 'location' => 'payment-log', + 'type' => 'amount', ); $log_message = t('@method payment for @amount entered by @user.', array('@method' => $method_name, '@amount' => uc_price($amount, $context), '@user' => uc_get_initials($user->uid))); uc_order_log_changes($order_id, array($log_message)); @@ -609,6 +614,7 @@ $context = array( 'revision' => 'formatted', 'location' => 'payment-delete-log', + 'type' => 'payment', 'subject' => array( 'payment' => $payment, ), === modified file 'payment/uc_payment/uc_payment_checkout_pane.inc' --- payment/uc_payment/uc_payment_checkout_pane.inc 2009-04-24 15:49:55 +0000 +++ payment/uc_payment/uc_payment_checkout_pane.inc 2009-07-01 15:50:51 +0000 @@ -103,6 +103,7 @@ $context = array( 'location' => 'checkout-review-line-item', + 'type' => 'line_item', ); foreach ($line_items as $line_item) { $context['subject'] = array('line_item' => $line_item); === modified file 'payment/uc_payment/uc_payment_order_pane.inc' --- payment/uc_payment/uc_payment_order_pane.inc 2009-04-18 01:03:01 +0000 +++ payment/uc_payment/uc_payment_order_pane.inc 2009-07-01 15:50:51 +0000 @@ -21,9 +21,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'payment-balance', - 'subject' => array( - 'order' => $arg1, - ), + 'type' => 'amount', ); $output = t('Balance: @balance', array('@balance' => uc_price(uc_payment_balance($arg1), $context))); $output .= ' ('. l(t('View'), 'admin/store/orders/'. $arg1->order_id .'/payments') .')
'; === modified file 'payment/uc_payment_pack/uc_payment_pack.admin.inc' --- payment/uc_payment_pack/uc_payment_pack.admin.inc 2009-04-18 01:03:01 +0000 +++ payment/uc_payment_pack/uc_payment_pack.admin.inc 2009-07-01 15:50:51 +0000 @@ -15,6 +15,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'receive-check-form', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, === modified file 'payment/uc_payment_pack/uc_payment_pack.module' --- payment/uc_payment_pack/uc_payment_pack.module 2009-04-18 01:03:01 +0000 +++ payment/uc_payment_pack/uc_payment_pack.module 2009-07-01 15:50:51 +0000 @@ -138,6 +138,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'cod-cart-details', + 'type' => 'amount', ); $details .= '

'. t('Orders totalling more than !number are not eligible for COD.', array('!number' => uc_price($max, $context))) .'

'; } === modified file 'payment/uc_paypal/uc_paypal.module' --- payment/uc_paypal/uc_paypal.module 2009-04-23 18:17:23 +0000 +++ payment/uc_paypal/uc_paypal.module 2009-07-01 15:50:51 +0000 @@ -282,6 +282,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'paypal-wpp-charge', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -602,6 +603,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'paypal-ec-checkout', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -691,6 +693,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'paypal-ec-form-submit', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -759,6 +762,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'paypal-ec-submit-form-submit', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -838,6 +842,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'paypal-wps-form', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, @@ -897,9 +902,15 @@ if (variable_get('uc_paypal_wps_submit_method', 'single') == 'itemized') { // List individual items + $context['type'] = 'order_product'; + $context['subject'] = array( + 'order' => $order, + ); $i = 0; foreach ($order->products as $item) { $i++; + $context['subject']['product'] = $item; + $context['subject']['node'] = node_load($item->nid); $data['amount_'. $i] = uc_price($item->price, $context, $options); $data['item_name_'. $i] = $item->title; $data['item_number_'. $i] = $item->model; === modified file 'payment/uc_paypal/uc_paypal.pages.inc' --- payment/uc_paypal/uc_paypal.pages.inc 2009-04-18 01:03:01 +0000 +++ payment/uc_paypal/uc_paypal.pages.inc 2009-07-01 15:50:51 +0000 @@ -81,6 +81,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'paypal-ipn', + 'type' => 'amount', ); $options = array( 'sign' => FALSE, === modified file 'shipping/uc_flatrate/uc_flatrate.admin.inc' --- shipping/uc_flatrate/uc_flatrate.admin.inc 2009-05-06 18:27:07 +0000 +++ shipping/uc_flatrate/uc_flatrate.admin.inc 2009-07-01 15:50:51 +0000 @@ -15,7 +15,7 @@ $context = array( 'location' => 'shipping-flatrate-method-admin', - 'subject' => array(), + 'type' => 'amount', ); $rows = array(); @@ -23,8 +23,6 @@ $weight = variable_get('uc_quote_method_weight', array()); $result = db_query("SELECT mid, title, label, base_rate, product_rate FROM {uc_flatrate_methods}"); while ($method = db_fetch_object($result)) { - $context['subject']['flatrate_method'] = $method; - $row = array(); $row[] = check_plain($method->title); $row[] = check_plain($method->label); === modified file 'shipping/uc_flatrate/uc_flatrate.module' --- shipping/uc_flatrate/uc_flatrate.module 2009-05-06 18:27:07 +0000 +++ shipping/uc_flatrate/uc_flatrate.module 2009-07-01 15:50:51 +0000 @@ -58,10 +58,9 @@ $context = array( 'revision' => 'formatted', 'location' => 'shipping-flatrate-method-node-form', - 'subject' => array(), + 'type' => 'amount', ); while ($method = db_fetch_object($result)) { - $context['subject']['flatrate_method'] = $method; if (!isset($form['shipping']['flatrate'])) { $form['shipping']['flatrate'] = array( '#type' => 'fieldset', @@ -77,7 +76,7 @@ '#type' => 'textfield', '#title' => $method->title, '#default_value' => $form['#node']->flatrate[$method->mid], - '#description' => t('Default rate: %price', array('%price' => uc_price($method->product_rate, $context))), + '#description' => t('Default rate: %price', array('%price' => uc_price($method->product_rate, $context))), '#size' => 16, '#field_prefix' => $sign_flag ? '' : $currency_sign, '#field_suffix' => $sign_flag ? $currency_sign : '', @@ -210,17 +209,14 @@ $context = array( 'revision' => 'altered', 'location' => 'shipping-flatrate-method-json', - 'subject' => array(), - 'extras' => array(), + 'type' => 'amount', ); if ($method = db_fetch_object(db_query("SELECT * FROM {uc_flatrate_methods} WHERE mid = %d", $mid))) { - $context['extras']['flatrate_method'] = $method; // Start at the base rate. $rate = $method->base_rate; foreach ($products as $product) { - $context['subject']['order_product'] = $product; if (empty($product->flatrate) || is_null($product->flatrate[$mid])) { $price_info = array( 'price' => $method->product_rate, @@ -239,7 +235,6 @@ } } - unset($context['subject']['order_product']); $altered = uc_price($rate, $context); $context['revision'] = 'formatted'; $formatted = uc_price($rate, $context); === modified file 'shipping/uc_quote/uc_quote.module' --- shipping/uc_quote/uc_quote.module 2009-06-29 19:07:54 +0000 +++ shipping/uc_quote/uc_quote.module 2009-07-01 15:50:51 +0000 @@ -868,7 +868,8 @@ case 'review': $context = array( 'location' => 'shipping-quote-checkout-pane-review', - 'subject' => array(), + 'type' => 'line_item', + 'subject' => array('order' => $arg1), ); $result = db_query("SELECT * FROM {uc_order_line_items} WHERE order_id = %d AND type = '%s'", $arg1->order_id, 'shipping'); if ($line_item = db_fetch_object($result)) { === modified file 'shipping/uc_shipping/uc_shipping.admin.inc' --- shipping/uc_shipping/uc_shipping.admin.inc 2009-06-04 13:49:23 +0000 +++ shipping/uc_shipping/uc_shipping.admin.inc 2009-07-01 15:50:51 +0000 @@ -589,13 +589,7 @@ } $context = array( 'location' => 'shipping-order-view', - 'class' => array( - 'cost', - ), - 'subject' => array( - 'shipment' => $shipment, - 'field' => 'cost', - ), + 'type' => 'amount', ); $rows[] = array(t('Cost:'), uc_price($shipment->cost, $context, array('label' => FALSE))); $output .= theme('table', array(), $rows, array('style' => 'width:auto')); === modified file 'shipping/uc_shipping/uc_shipping.module' --- shipping/uc_shipping/uc_shipping.module 2009-04-28 16:54:42 +0000 +++ shipping/uc_shipping/uc_shipping.module 2009-07-01 15:50:51 +0000 @@ -238,10 +238,7 @@ } $context = array( 'location' => 'shipping-package-view', - 'subject' => array( - 'package' => $package, - 'field' => 'value', - ), + 'type' => 'amount', ); $rows[] = array(t('Insured value:'), uc_price($package->value, $context)); if ($package->tracking_number) { === modified file 'shipping/uc_ups/uc_ups.admin.inc' --- shipping/uc_ups/uc_ups.admin.inc 2009-04-24 15:49:55 +0000 +++ shipping/uc_ups/uc_ups.admin.inc 2009-07-01 15:50:51 +0000 @@ -208,10 +208,7 @@ $output .= ''. $method['ups']['quote']['accessorials'][$_SESSION['ups']['service']] .'
'; $context = array( 'location' => 'shipping-ups-confirm', - 'subject' => array( - 'ups_info' => $_SESSION['ups'], - 'field' => 'amount', - ), + 'type' => 'amount', ); $output .= ''. check_plain($_SESSION['ups']['rate']['type']) .': '. uc_price($_SESSION['ups']['rate']['amount'], $context) .' ('. check_plain($_SESSION['ups']['rate']['currency']) .')
'; $ship_date = $_SESSION['ups']['ship_date']; === modified file 'shipping/uc_ups/uc_ups.module' --- shipping/uc_ups/uc_ups.module 2009-05-06 18:27:07 +0000 +++ shipping/uc_ups/uc_ups.module 2009-07-01 15:50:51 +0000 @@ -836,7 +836,7 @@ uasort($quotes, 'uc_quote_price_sort'); $context = array( 'location' => 'shipping-quote', - 'subject' => array(), + 'type' => 'amount', ); foreach ($quotes as $key => $quote) { if (isset($quote['rate'])) { === modified file 'shipping/uc_usps/uc_usps.module' --- shipping/uc_usps/uc_usps.module 2009-06-22 15:13:26 +0000 +++ shipping/uc_usps/uc_usps.module 2009-07-01 15:50:51 +0000 @@ -401,7 +401,7 @@ } $context = array( 'location' => 'shipping-usps-quote', - 'subject' => array(), + 'type' => 'amount', ); foreach ($services as $key => $quote) { if (isset($quote['rate'])) { === modified file 'shipping/uc_weightquote/uc_weightquote.module' --- shipping/uc_weightquote/uc_weightquote.module 2009-05-06 18:27:07 +0000 +++ shipping/uc_weightquote/uc_weightquote.module 2009-07-01 15:50:51 +0000 @@ -178,16 +178,12 @@ $context = array( 'revision' => 'altered', 'location' => 'shipping-weightquote-quote', - 'subject' => array(), - 'extras' => array( - 'method' => $method, - ), + 'type' => 'amount', ); $rate = 0; foreach ($products as $product) { $node = node_load($product->nid); - $context['subject']['order_product'] = $product; $price_info = array( 'price' => $node->weightquote, 'qty' => $product->qty, @@ -196,7 +192,6 @@ } $rate += variable_get('uc_weightquote_base_rate', 0); - unset($context['subject']['order_product']); $altered = uc_price($rate, $context); $context['revision'] = 'formatted'; $formatted = uc_price($rate, $context); === modified file 'uc_attribute/uc_attribute.admin.inc' --- uc_attribute/uc_attribute.admin.inc 2009-06-09 15:01:27 +0000 +++ uc_attribute/uc_attribute.admin.inc 2009-07-01 15:50:51 +0000 @@ -201,7 +201,8 @@ $context = array( 'location' => 'attribute-options-form', - 'extras' => array( + 'type' => 'attribute_option', + 'subject' => array( 'attribute' => $attribute, ), ); @@ -232,13 +233,11 @@ ), ); - $context['subject'] = array( - 'option' => $option, - 'field' => 'cost', - ); + $context['subject']['option'] = $data; + $context['field'] = 'cost'; $form['options'][$key]['cost']['#value'] = uc_price($data->cost, $context); - $context['subject']['field'] = 'price'; + $context['field'] = 'price'; $form['options'][$key]['price']['#value'] = uc_price($data->price, $context); } @@ -487,16 +486,15 @@ $context = array( 'location' => 'attribute-form-default-option', + 'type' => 'attribute_option', ); if (count($attributes) > 0) { foreach ($attributes as $attribute) { $option = $attribute->options[$attribute->default_option]; $context['subject'] = array( + 'attribute' => $attribute, 'option' => $option, ); - $context['extras'] = array( - 'attribute' => $attribute, - ); $form['attributes'][$attribute->aid] = array( 'remove' => array( === modified file 'uc_attribute/uc_attribute.module' --- uc_attribute/uc_attribute.module 2009-06-10 20:28:03 +0000 +++ uc_attribute/uc_attribute.module 2009-07-01 15:50:51 +0000 @@ -614,19 +614,19 @@ $context = array( 'revision' => 'formatted', 'location' => 'product-attribute-form-element', - 'subject' => array(), - 'extras' => array(), ); // Loop through each product attribute and generate its form element. foreach ($attributes as $attribute) { - $context['extras']['attribute'] = $attribute; + $context['subject']['attribute'] = $attribute; // Build the attribute's options array. $options = array(); foreach ($attribute->options as $option) { $context['subject']['option'] = $option; switch (variable_get('uc_attribute_option_price_format', 'adjustment')) { case 'total': + $context['type'] = 'product'; + $context['subject']['node'] = $product; $price_info = array( 'price' => $product->sell_price + $option->price, 'qty' => $qty, @@ -636,6 +636,7 @@ break; } case 'adjustment': + $context['type'] = 'attribute_option'; $price_info = array( 'price' => $option->price, 'qty' => $qty, === modified file 'uc_cart/uc_cart.admin.inc' --- uc_cart/uc_cart.admin.inc 2009-05-09 17:41:42 +0000 +++ uc_cart/uc_cart.admin.inc 2009-07-01 15:50:51 +0000 @@ -53,7 +53,8 @@ $context = array( 'revision' => 'formatted', - 'location' => 'minimum-subtotal-summary' + 'location' => 'minimum-subtotal-summary', + 'type' => 'amount', ); $form['general']['uc_minimum_subtotal'] = array( '#type' => 'textfield', === modified file 'uc_cart/uc_cart.module' --- uc_cart/uc_cart.module 2009-06-16 21:16:15 +0000 +++ uc_cart/uc_cart.module 2009-07-01 15:50:51 +0000 @@ -671,13 +671,14 @@ $context = array( 'location' => 'cart-block-item', + 'field' => 'price', ); // Loop through each item. foreach ($items as $item) { $context['subject'] = array( 'cart_item' => $item, - 'field' => 'price', + 'node' => node_load($item->nid); ); // Add the basic row with quantity, title, and price. $output .= '' @@ -720,6 +721,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'cart-block-total', + 'type' => 'amount', ); // Build the basic table with the number of items in the cart and total. $output = '
'. $item['qty'] .'
' @@ -881,6 +883,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'cart-subtotal', + 'type' => 'amount', ); $i = 0; foreach ($items as $item) { @@ -1061,6 +1064,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'cart-table-subtotal', + 'type' => 'amount', ); $table[] = array( 'total' => array( === modified file 'uc_cart/uc_cart.pages.inc' --- uc_cart/uc_cart.pages.inc 2009-05-06 18:27:07 +0000 +++ uc_cart/uc_cart.pages.inc 2009-07-01 15:50:51 +0000 @@ -60,6 +60,7 @@ $context = array( 'revision' => 'altered', 'location' => 'minimum-subtotal', + 'type' => 'amount', ); if (($min = uc_price(variable_get('uc_minimum_subtotal', 0), $context)) > 0) { @@ -76,6 +77,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'minimum-subtotal-message', + 'type' => 'amount', ); drupal_set_message(variable_get('uc_minimum_subtotal_text', t('The minimum order subtotal for checkout is !min.', array('!min' => uc_price($min, $context)))), 'error'); drupal_goto('cart'); @@ -202,6 +204,7 @@ $context = array( 'revision' => 'altered', 'location' => 'cart-checkout-item', + 'type' => 'cart_item', ); $contents = uc_cart_get_contents(); foreach ($contents as $key => $item) { @@ -210,9 +213,8 @@ 'qty' => $item->qty, ); $context['subject'] = array( + 'cart' => $contents, 'cart_item' => $item, - ); - $context['extras'] = array( 'node' => node_load($item->nid), ); === modified file 'uc_cart/uc_cart_checkout_pane.inc' --- uc_cart/uc_cart_checkout_pane.inc 2009-06-24 16:34:52 +0000 +++ uc_cart/uc_cart_checkout_pane.inc 2009-07-01 15:50:51 +0000 @@ -29,8 +29,8 @@ $output = '
'; $context = array( 'location' => 'cart-review-item', + 'type' => 'cart_item', 'subject' => array(), - 'extras' => array(), ); foreach ($items as $item) { $desc = check_plain($item->title); @@ -43,9 +43,8 @@ 'qty' => $item->qty, ); $context['subject'] = array( + 'cart' => $items, 'cart_item' => $item, - ); - $context['extras'] = array( 'node' => node_load($item->nid), ); $output .= '
'. $item->qty .'x'. $desc @@ -578,18 +577,20 @@ ); // Set up table rows. - foreach (uc_cart_get_contents() as $item) { + $contents = uc_cart_get_contents(); + foreach ($contents as $item) { $price_info = array( 'price' => $item->price, 'qty' => $item->qty, ); + + $context['revision'] = 'altered'; + $context['type'] = 'cart_item'; $context['subject'] = array( + 'cart' => $contents, 'cart_item' => $item, - ); - $context['extras'] = array( 'node' => node_load($item->nid), ); - $context['revision'] = 'altered'; $total = uc_price($price_info, $context); $subtotal += $total; @@ -600,8 +601,9 @@ } // Remove node from context to prevent the price from being altered. + $context['revision'] = 'themed-original'; + $context['type'] = 'amount'; unset($context['subject']); - $context['revision'] = 'themed-original'; $rows[] = array( array('data' => t('@qty×', array('@qty' => $item->qty)), 'class' => 'qty'), array('data' => $description, 'class' => 'products'), @@ -614,6 +616,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'cart-checkout-subtotal', + 'type' => 'amount', ); $rows[] = array( 'data' => array(array('data' => '' . t('Subtotal:') . ' ' . uc_price($subtotal, $context), 'colspan' => 4, 'class' => 'subtotal')), === modified file 'uc_catalog/uc_catalog.module' --- uc_catalog/uc_catalog.module 2009-06-29 20:24:45 +0000 +++ uc_catalog/uc_catalog.module 2009-07-01 15:50:51 +0000 @@ -689,6 +689,7 @@ $count = 0; $context = array( 'location' => 'catalog-grid-product', + 'type' => 'product', ); foreach ($products as $nid) { $product = node_load($nid); === modified file 'uc_order/templates/admin.itpl.php' --- uc_order/templates/admin.itpl.php 2009-06-17 19:43:20 +0000 +++ uc_order/templates/admin.itpl.php 2009-07-01 15:50:51 +0000 @@ -18,6 +18,7 @@ 'order-invoice-admin', + 'type' => 'order_product', ); foreach ($products as $product) { $price_info = array( === modified file 'uc_order/uc_order.admin.inc' --- uc_order/uc_order.admin.inc 2009-06-23 14:09:18 +0000 +++ uc_order/uc_order.admin.inc 2009-07-01 15:50:51 +0000 @@ -451,9 +451,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'orders-admin', - 'subject' => array( - 'field' => 'order_total', - ), + 'type' => 'amount', ); $result = pager_query($sql, variable_get('uc_order_number_displayed', 30), 0, NULL, $args); @@ -476,7 +474,6 @@ } } - $context['subject']['order'] = $order; $rows[] = array( 'data' => array( array('data' => uc_order_actions($order, TRUE), 'nowrap' => 'nowrap'), @@ -955,6 +952,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'order-history', + 'type' => 'amount', ); // Build a table based on the customer's orders. while ($order = db_fetch_object($result)) { @@ -1197,11 +1195,10 @@ $context = array( 'location' => 'order-product-add', 'revision' => 'altered', + 'type' => 'order_product', 'subject' => array( - 'cart_item' => $product, - 'field' => 'price', - ), - 'extras' => array( + 'order' => $order, + 'product' => $product, 'node' => clone $product, ), ); === modified file 'uc_order/uc_order.line_item.inc' --- uc_order/uc_order.line_item.inc 2009-05-06 18:27:07 +0000 +++ uc_order/uc_order.line_item.inc 2009-07-01 15:50:51 +0000 @@ -27,6 +27,7 @@ $context = array( 'revision' => 'altered', 'location' => 'cart-preview-subtotal-item', + 'type' => 'order_product', ); $subtotal = 0; foreach ($arg1 as $item) { @@ -35,9 +36,8 @@ 'qty' => ($item->qty) ? $item->qty : 1, ); $context['subject'] = array( - 'cart_item' => $item, - ); - $context['extras'] = array( + 'order' => $arg1, + 'product' => $item, 'node' => node_load($item->nid), ); $total = uc_price($price_info, $context); === modified file 'uc_order/uc_order.module' --- uc_order/uc_order.module 2009-05-07 20:12:13 +0000 +++ uc_order/uc_order.module 2009-07-01 15:50:51 +0000 @@ -372,12 +372,11 @@ $context = array( 'revision' => 'formatted', 'location' => 'order-subtotal-token', + 'type' => 'line_item', 'subject' => array( + 'order' => $order, 'line_item' => $order->line_items[$key], ), - 'extras' => array( - 'order' => $order, - ), ); $subtotal = uc_price($order->line_items[$key]['amount'], $context); } @@ -390,12 +389,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'order-total-token', - 'subject' => array( - 'field' => 'order_total', - ), - 'extras' => array( - 'order' => $order, - ), + 'type' => 'amount', ); $values['order-total'] = uc_price($order->order_total, $context); $values['order-email'] = check_plain($order->primary_email); === modified file 'uc_order/uc_order.order_pane.inc' --- uc_order/uc_order.order_pane.inc 2009-05-26 13:10:31 +0000 +++ uc_order/uc_order.order_pane.inc 2009-07-01 15:50:51 +0000 @@ -268,10 +268,10 @@ function uc_order_pane_products($op, $arg1) { switch ($op) { case 'view': - return drupal_render(tapir_get_table('op_products_view_table', $arg1->products)); + return drupal_render(tapir_get_table('op_products_view_table', $arg1)); case 'customer': - return drupal_render(tapir_get_table('op_products_customer_table', $arg1->products)); + return drupal_render(tapir_get_table('op_products_customer_table', $arg1)); case 'edit-theme': drupal_add_js('uc_order_load_product_edit_div('. $arg1['order_id']['#value'] .');', 'inline'); @@ -333,8 +333,8 @@ $context = array( 'location' => 'order-line-items', - 'subject' => array(), - 'extras' => array( + 'type' => 'line_item', + 'subject' => array( 'order' => $arg1, ), ); @@ -405,8 +405,8 @@ $context = array( 'location' => 'order-edit-line-items', - 'subject' => array(), - 'extras' => array( + 'type' => 'line_item', + 'subject' => array( 'order' => $arg1, ), ); @@ -689,7 +689,7 @@ /** * Build the order view products table. */ -function op_products_view_table($products) { +function op_products_view_table($order) { $table = array( '#type' => 'tapir_table', '#attributes' => array('class' => 'order-pane-table'), @@ -743,10 +743,14 @@ $context = array( 'location' => 'order-view-products', + 'type' => 'order_product', + 'subject' => array( + 'order' => $order, + ), ); - if (is_array($products)) { - foreach ($products as $product) { + if (is_array($order->products)) { + foreach ($order->products as $product) { $data = array(); $data['qty'] = array( '#value' => $product->qty .'x', @@ -767,18 +771,18 @@ '#cell_attributes' => array('align' => 'center', 'nowrap' => 'nowrap'), ); - $context['subject'] = array( - 'order_product' => $product, - 'field' => 'cost', - ); + $context['subject']['product'] = $product; + $context['subject']['node'] = node_load($product->nid); if (user_access('administer products')) { + $context['field'] = 'cost'; + $data['cost'] = array( '#value' => uc_price($product->cost, $context), '#cell_attributes' => array('align' => 'right', 'nowrap' => 'nowrap'), ); } - $context['subject']['field'] = 'price'; + $context['field'] = 'price'; $price_info = array( 'price' => $product->price, 'qty' => $product->qty, @@ -859,10 +863,14 @@ $context = array( 'location' => 'order-customer-products', + 'type' => 'order_product', + 'subject' => array( + 'order' => $order, + ), ); - if (is_array($products)) { - foreach ($products as $product) { + if (is_array($order->products)) { + foreach ($order->products as $product) { $data = array(); $data['qty'] = array( '#value' => $product->qty .'x', @@ -883,18 +891,17 @@ '#cell_attributes' => array('align' => 'center', 'nowrap' => 'nowrap'), ); - $context['subject'] = array( - 'order_product' => $product, - 'field' => 'cost', - ); + $context['subject']['product'] = $product; + $context['subject']['node'] = node_load($product->nid); if (user_access('administer products')) { + $context['field'] = 'cost'; $data['cost'] = array( '#value' => uc_price($product->cost, $context), '#cell_attributes' => array('align' => 'right', 'nowrap' => 'nowrap'), ); } - $context['subject']['field'] = 'price'; + $context['field'] = 'price'; $price_info = array( 'price' => $product->price, 'qty' => $product->qty, === modified file 'uc_product/uc_product.module' --- uc_product/uc_product.module 2009-06-22 15:10:29 +0000 +++ uc_product/uc_product.module 2009-07-01 15:50:51 +0000 @@ -700,6 +700,7 @@ $context = array( 'location' => 'product-view', + 'type' => 'product', 'class' => array( 'product', ), @@ -716,7 +717,7 @@ } $context['class'][1] = 'display'; - $context['subject']['field'] = 'sell_price'; + $context['field'] = 'sell_price'; $node->content['display_price'] = array('#value' => theme('uc_product_price', $node->sell_price, $context), '#access' => $enabled['display_price'], '#weight' => $weight['display_price'], @@ -731,14 +732,14 @@ $node->content['body']['#weight'] = 1; $context['class'][1] = 'list'; - $context['subject']['field'] = 'list_price'; + $context['field'] = 'list_price'; $node->content['list_price'] = array('#value' => theme('uc_product_price', $node->list_price, $context), '#access' => $enabled['list_price'], '#weight' => $weight['list_price'], ); $context['class'][1] = 'cost'; - $context['subject']['field'] = 'cost'; + $context['field'] = 'cost'; $node->content['cost'] = array('#value' => theme('uc_product_price', $node->cost, $context), '#access' => $enabled['cost'] && user_access('administer products'), '#weight' => $weight['cost'], @@ -750,7 +751,7 @@ } $context['class'][1] = 'sell'; - $context['subject']['field'] = 'sell_price'; + $context['field'] = 'sell_price'; $node->content['sell_price'] = array('#value' => theme('uc_product_price', $node->sell_price, $context, array('label' => !$teaser)), '#access' => $enabled['sell_price'], '#weight' => $weight['sell_price'], @@ -1108,10 +1109,9 @@ $context = array( 'revision' => 'altered', 'location' => 'cart-item', + 'type' => 'cart_item', 'subject' => array( 'cart_item' => $item, - ), - 'extras' => array( 'node' => $node, ), ); @@ -1245,6 +1245,7 @@ $context = array( 'location' => 'product-tapir-table', + 'type' => 'product', 'class' => array('product'), ); $options = array('label' => FALSE); @@ -1271,12 +1272,12 @@ $context['subject'] = array('node' => $node); if ($enabled['list_price']) { $context['class'][1] = 'list'; - $context['subject']['field'] = 'list_price'; + $context['field'] = 'list_price'; $data['list_price'] = array('#value' => uc_price($node->list_price, $context, $options), '#cell_attributes' => array('nowrap' => 'nowrap')); } if ($enabled['sell_price']) { $context['class'][1] = 'sell'; - $context['subject']['field'] = 'sell_price'; + $context['field'] = 'sell_price'; $data['price'] = array('#value' => uc_price($node->sell_price, $context, $options), '#cell_attributes' => array('nowrap' => 'nowrap')); } === modified file 'uc_product/views/uc_product_handler_field_price.inc' --- uc_product/views/uc_product_handler_field_price.inc 2009-06-22 14:28:18 +0000 +++ uc_product/views/uc_product_handler_field_price.inc 2009-07-01 15:50:51 +0000 @@ -13,13 +13,14 @@ function render($values) { $context = array( 'location' => 'views-price-handler', + 'type' => 'product', 'class' => array( 'product', $this->field, ), + 'field' => $this->real_field, 'subject' => array( 'node' => $values, - 'field' => $this->real_field, ), ); $options = array('label' => FALSE); === modified file 'uc_product_kit/uc_product_kit.module' --- uc_product_kit/uc_product_kit.module 2009-05-29 14:42:03 +0000 +++ uc_product_kit/uc_product_kit.module 2009-07-01 15:50:51 +0000 @@ -463,6 +463,7 @@ $context = array( 'revision' => 'formatted', 'location' => 'product-kit-form-item-discount', + 'type' => 'product', ); if (isset($node->products)) { foreach ($node->products as $i => $product) { @@ -481,9 +482,10 @@ '#title' => t('List position'), '#default_value' => isset($product->ordering) ? $product->ordering : 0, ); + + $context['field'] = 'sell_price'; $context['subject'] = array( 'node' => $product, - 'field' => 'sell_price', ); $form['base']['items'][$i]['discount'] = array('#type' => 'textfield', '#title' => t('Discount'), @@ -511,6 +513,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'product-kit-form-total', + 'type' => 'amount', ); $form['base']['kit_total'] = array( '#type' => 'textfield', @@ -573,6 +576,7 @@ $context = array( 'location' => 'product-kit-view', + 'type' => 'product', 'class' => array( 'product-kit', ), @@ -588,7 +592,7 @@ ); } $context['class'][1] = 'display'; - $context['subject']['field'] = 'sell_price'; + $context['field'] = 'sell_price'; $node->content['display_price'] = array('#value' => uc_price($node->sell_price, $context), '#access' => $enabled['display_price'], '#weight' => $weight['display_price'], @@ -601,14 +605,14 @@ $node->content['body']['#weight'] = 1; $context['class'][1] = 'list'; - $context['subject']['field'] = 'list_price'; + $context['field'] = 'list_price'; $node->content['list_price'] = array('#value' => uc_price($node->list_price, $context), '#access' => $enabled['list_price'], '#weight' => $weight['list_price'], ); $context['class'][1] = 'cost'; - $context['subject']['field'] = 'cost'; + $context['field'] = 'cost'; $node->content['cost'] = array('#value' => uc_price($node->cost, $context), '#access' => $enabled['cost'] && user_access('administer products'), '#weight' => $weight['cost'], @@ -619,7 +623,7 @@ } $context['class'][1] = 'sell'; - $context['subject']['field'] = 'sell_price'; + $context['field'] = 'sell_price'; $node->content['sell_price'] = array('#value' => uc_price($node->sell_price, $context, array('label' => !$teaser)), '#access' => $enabled['sell_price'], '#weight' => $weight['sell_price'], @@ -908,13 +912,12 @@ $context = array( 'revision' => 'altered', 'location' => 'cart-item', + 'type' => 'cart_item', + 'field' => 'price', 'subject' => array( 'cart_item' => $item, - 'field' => 'price', - ), - 'extras' => array( + 'node' => $kit->products[$item->nid], 'kit' => $kit, - 'node' => $kit->products[$item->nid], ), ); $price_info = array( === modified file 'uc_reports/uc_reports.admin.inc' --- uc_reports/uc_reports.admin.inc 2009-06-24 15:37:14 +0000 +++ uc_reports/uc_reports.admin.inc 2009-07-01 15:50:51 +0000 @@ -74,6 +74,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'customer-report', + 'type' => 'amount', ); $customers = pager_query($sql . tablesort_sql($header), $page_size, 0, $sql_count); @@ -181,6 +182,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'products-report', + 'type' => 'amount', ); $products = pager_query("SELECT $sql_vars FROM $sql_tables WHERE $sql_conditions GROUP BY n.nid, n.title" . tablesort_sql($header), $page_size, 0, $sql_count); @@ -416,6 +418,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'sales-report-summary', + 'type' => 'amount', ); $rows[] = array( @@ -550,6 +553,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'sales-year-report', + 'type' => 'amount', ); // For each month of the year... @@ -700,6 +704,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'sales-custom-report', + 'type' => 'amount', ); // Loop through the subreports and build the report table. === modified file 'uc_store/includes/uc_price.inc' --- uc_store/includes/uc_price.inc 2009-05-08 19:14:30 +0000 +++ uc_store/includes/uc_price.inc 2009-07-01 15:50:51 +0000 @@ -85,7 +85,8 @@ ); $context += array( - 'revision' => 'themed' + 'revision' => 'themed', + 'type' => 'amount', ); // Clamp to allowed revisions. === modified file 'uc_store/uc_store.admin.inc' --- uc_store/uc_store.admin.inc 2009-05-15 14:05:26 +0000 +++ uc_store/uc_store.admin.inc 2009-07-01 15:50:51 +0000 @@ -696,6 +696,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'currency-format-form', + 'type' => 'amount', ); $form['currency']['example'] = array( '#type' => 'textfield', @@ -903,6 +904,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'customer-orders', + 'type' => 'amount', ); $totals = array('orders' => 0, 'items' => 0, 'total' => 0); while ($order = db_fetch_object($result)) { @@ -932,7 +934,6 @@ $totals['items'] += $item_count['COUNT(*)']; $totals['total'] += $order->order_total; - $context['subject'] = array('order' => $order); $rows[] = array( 'data' => array( array('data' => $icons), @@ -956,6 +957,7 @@ $context = array( 'revision' => 'formatted-original', 'location' => 'customer-orders-total', + 'type' => 'amount', ); $output = '

'. l(t('Create an order for this customer.'), 'admin/store/orders/create/'. $uid) .'

'; === modified file 'uc_tax_report/uc_tax_report.module' --- uc_tax_report/uc_tax_report.module 2009-04-24 15:49:55 +0000 +++ uc_tax_report/uc_tax_report.module 2009-07-01 15:50:51 +0000 @@ -123,6 +123,7 @@ $context = array( 'revision' => 'themed-original', 'location' => 'tax-report', + 'type' => 'amount', ); foreach($totals as $line) { $row = array( === modified file 'uc_taxes/uc_taxes.module' --- uc_taxes/uc_taxes.module 2009-06-17 15:27:58 +0000 +++ uc_taxes/uc_taxes.module 2009-07-01 15:50:51 +0000 @@ -148,8 +148,8 @@ $context = array( 'revision' => 'formatted', 'location' => 'tax-changes-log', - 'subject' => array(), - 'extras' => array( + 'type' => 'line_item', + 'subject' => array( 'order' => $arg1, ), ); # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ+UigoAI7RfgFUUX+f//3YE AAq////4YCTbiikdvRwAPdnX2HTXtt2uxRH3NT19zAAPcwB5u7QetUAkAp9B9977wG7ALd2j3Xwx EcOyw0ZLWanXE7YsNoCgAoO2GiSmxahCSRA0KeJpkZAGmpqn6ZNKDQDQBoGIhkhqoHtKH6UaA0AG IaZAAA0yASUTFT2qe2o0moAAAwJoNABJpIk0hNNDUnlP1T1PUep5I8UAANNGgAikQTAQTJgJo0Ca YknpqDTQyGgSggAIJDUZKaehkJAAA0BoUGYMB8vT0B9Sezv6k/D4/G4+YKK+bJQkS9wICgnrz1d8 9Pf+AVVU7ilRPKyrBSoXGpRoxograY4zBUXGFcagf+yi5aKoMq2uMLlo5aPjrMaIaZgYUwRY/b3e J8PHx8PZE+x0bjxuV4zWHZlPJuNL3dvz05+xezv3Dw6ZladcPPNSQUIoVmCTJ4FDjicTCb9EoTGC hgJKCaaiYUlSZT0npmpMtgPc5aYONAGctOx9Hfx0V/GXPi/grygfLIi8ynnXhxey435b13BgGosG br0oG+675sNsnawOGBtAG2sWQrUKydyTEkhnbSQnPAiIgwFYogSCWaKFYTvcbFF4M2k5iBRBiqFb x31xE6+qdmFbmG0i4errVaTxeHEIp3e7l3mX0JTkPtVVug82KzXmapNFoVlKcsPsCK5lpGVoDimT JCXeDGSSjJS92wASATmSACOqeafHVMsM/xqslGx+P78yQkYigkQGQMEEQQwMLBFP9HP/M7hU/CKY IpEQosFFFUEYiKRVFAVYopBRVVRZFiwFkUWAoooCxSCigKKCqQWAooIwh5fzZmYAefp7jXn7q9Jg In7q77k527UJLujCboiaS49iBJ5icotZciKD7M5J3Y0gIshqepeiyBgXr6isLRSnMetd2nEBrqiY Qu10AG2Y3jhy4euHAUCBxyUESQCea9QIy5hgjmlTmIudzamzZm5cCNN7AqJcwpIJEEXslw63ZkLj HdxSnjg2X1EhFt5WZOghyCalNZEEIhG4UFghak8aNJyHL4hw2CHdBY7jgxCycKZVFTLUUXBbEsRm 4YcId3yAjh20AiXWJWbu3izObGXbIsMmi0wAYWFzRJoiTtvECy9JoSAuEIIEjNRDtIJOlEacNmTh aNQetdptRtnVdUUmJwtpREEaWKQc1SosdTabiH0gRN7EEZomJme53yEg19gQlqFqxdErdrGJ9GSE bPniSP0kUwCllzm/ehFKt8lU41yBUwvso64jt1D3enb0dT2Uw5BUxFe/1f1a9OzDLtm2cx/xK3bp +uXsdWVdipE8qzEybiK2N2JwUJHy+77yIJIIoqCrFViKxR57O5eeY9ezjdqcHbUOKPdQQV1hFiEZ kz72DMOz8Qhex1z0rV9v9YuWpbdMk8LWtHtZaag8OLz3L2EEBreHREQE/D9yT62fP5R+diGBQ+mS oJXHMybPssowQYiHR+Cnh8AbC+vIEDzslElMkte7n7trCLAXi0UDhAOExhKwxPr3uG5pEWNartKi v3bvTW8qWw0AxiklObCFqq4YScSchJM0CSmUYEwtIir5rl4kiMm5nSmE6YiOEMmG9WQrK7thf0tF jGTLYatEZlXWZDbZpUOIG0SOTAw44uIDL+kU5PbfT0PsTGbyZZWYwjrT6g4ZDE6IBynVDGdzJWAd WLEQ+iIkTIoc4kbfuXL+MuzPf5jL7u1ECT1+gcj1HDnDe7DkGFU6EREN21BmZ6MeewUz6qAwTYIk GHkp/s42OH+T4lMFhow/Yf0NyGh6zsKaM7E5A3khOHcoGBVjDhiHgmlIilFjDJkyCCACFgVTSgdh abZz0RGsg915Dyr274iXTk7Kh1RwwwT9GvcutrNy2Zr3e627hsPNsrKCiZORgC4/Aju1kHXUE9tK fLWaywxdAaYCIkUHiHbiwbxEMxjRdc1R8Yx6NCieT/0lvjk/ccB98cF8XW97s0GymGTwPwkxHVDM qey6QxJRASlnHAciaBU58sM279VNcXmZKYcFNCGzYYGzobOEIcIw+RJDqRogiH+yDgiHpvz6tz6e nq8p+w7e04lXgRpJkZiUTpz3kJBSdHlnRhtCpjA0km0OvFhwyQ4YaQMZJjy8s4RQ6XeSBtAWSdGB NMFA6MJerQOGB0RYdUMYPY9aUdDLXlGcKTHIDAiKiABQVEBAiXFIkaRgiPcRRoCIiD+SMxwpKV6n xZKkRkAPoRIBAYPoOIiXrGw7G6yMA6MGxYTJlDRWYtlalnyrIOgqJpmgxcvXYSSS4oiYCJqFemZM 54/iIzF5Wc4nFdmBCmQqkpYMpFGBVJxe8326KpGAjYUEWkBqBcFpJo12Gg1FRRIFIFavld2Z8Sii REREMCCIWoKOQPA5Y8BXEurutEqIVbbQAsviRmsKixrJKCEUENFqEZDlSxwaCQiIQY0YJjGT/zo5 IEzRIqQJETY45IsKcGyg5MoRNkipYUvv0FgxUQJxjTWUEROPJCseOIzLprVaAp+eW8PVP0xFPztX uHPDQX8EREAg6+efeIGXr6tBJrZSKtqe/jFzzc4KozyNsjDdvwPTycculxdYcPIU2aqo4SwrjxC0 VSwQpkUJSyjK6AlVlVen7GQLXXkTblXEz4WpfWq1lhRDSQ2ZzPkWFDU4XH2xrd/jdSakhkAjsYH0 r64kui9YHgYmIiIbQcb5kUQIlDXxIpzJCbnXWeZkyYqgrltPZFUFKkGDApBUMquDvi8MqrWF4tCU 2i0fp2QXFOe61t4p1WVpPaKvCi3SQxkb8k8oVn6XOvHPYeJ+giI3gWIzIw7KgCk6HoTGGCRxcmyq TQc9EKxSvPgREHwnSVyQOLrEyjGyIaFwbIHg0QtJCtGwM9ol33MjNIrTIATyTDjchOBkyIiILzFe BfQsXKtZMaV3WEOFDiwskzdqNl6gBdIDlAU5m2HvWiR5RERgmONEsw6nRwKbIJcst7QIl/0+qXzI siKknOAtC90QCA4RZjS8qlCoffsYmQLHsIiIcUe+GfqLRN1NTIzsEUAevqOP2EzwCJx6iIhwOaKl SgZMnk9vlU5PAgk+ixY4IVrUkUKFDxsgOfoiRDRwQFNEzk+IGCZsmHkiKST+XSJLAhP+Po4AkkM1 ttM9cTlhuCZVkkh9IDnCAqqvWPIo1QMGC7CbtwaHOugcGSJiCk85suVN8yZCinqcVdBEVzTEU0lR 002lky4QZgwAWNBg7ERLkwvW0mFGRsYRj3jQuKYQB1Wki2IvMV5hRyBTy6EVMDDCLAY9ShkVEcgr UwKFAcNhER0yN6mPUyDn3Th5Aotn5xbJf5RnCmwmcdVihdUuaKNloXBEUYUa6KwdC15DEyC+TOj8 kIxVFUPC0LluU8DRS45dyo0+T3LxkvLSbZHA6OCJHtyKSMEyJKUmlAo9ERTssVGKkomGjIGqdFQu dC4tN1xBnXlm7CRr4OB0vwyckjgxAqq8G4ajzQJCaHpg7oaJACRMHZYicjJIkZRGIki5ydETJoiS IHcIBAtKyUgSjE5OWapyBMXk5OGJPmJJGVosYP0xOwJVrVCmT0Z46Si4oGbDGQpoqaaEciE1xNp4 vXFhrIq8wV5OLxXtN3PZxswShWZstBmFGZoroC1NeMNUaAk3TM8YKxa4QvxyQ0Z/IVHPi8Chswex 5GHNW5UbCAZe7jUKZiMRDKBgwPO1APUgQ8uPg9iF3gY4ZmcDLh+8iN6inYqTPT4PBamH5vVFrAiR HkMXKOxhnrJp0b1n9Qnyc/DvsarFS2Lr2aL+s4lDsZSptxAi4r4yVwMz5FQaoxw+38ESRiDzxjqK cEigw6ZFoV2MVM5gbxgo8vsmi/6ikxX7JXc8mDs8mQ8CnsSOBhxjs7HNlhxxi5UieC5Sf+aTYVBU Zi8rJmwgwwuPpxrQN+0R9Q4+jkCI4fHHhWF90U327rMkxBRPaK9wdh5Cjh5O1TFKsuvOAUmPJUC3 zoEhksDQAzEIAsRna6u72nYuMMcky5MSUCuCDnzYgiIhFZl9dbMPxmZrIiKoR6iMA4a5TMgR0PQO BEiyZhhMKqSiTKokIFsETRE+4KTERNtYmYspaDssDR5KGSs57ykFIRBxvh3SpbYxwKULXvoNBPkW BI/bA2+kETk6zELkzCAcc/BIcWpwWPgsaL2VKQ2jfg6Ng4bArkDkuVJGjRiC1p3IQRdpQzKxMwOW HGSZm6c+seFFG0cDngj2LNFW5wP4ECYegiIZ9WMHRcY2dHJUkdFC1oECBwTICImhiJgU8HRMiSBg gcmzQxIznBg/h9uAn8jkPRv2PCHjsQTmVVh4hlpt6xeD76d4HfSc47VOaKcvYWOE+xrvRi0KR9uv DyLUwKVqtw7VX7XzD2aPGbnGsBdAdxASOVgxfRBzItBERCqI4qkBrKRZhERCpaOjxKUM0agtDqUx PlOQAT4bApwT5dNq2KJMug45F2yTPY5Pfct2XpxamyF4l0xMpNnEUykjaQKG8OnFnnit1SYiIg/Z ShwZI+xM2Gui4pE0RtSg3BA0SEXZO0dqopAyRcWx5KyWk5zNi0VIrx6ZJnBaV1RKCkReUXkgStyg iQDs5Kkc2MGDg2ZLjETk4OpkxiBOYvyFKkBjs5PfMzJE65IjGynn7e5+oYQsSl+NtBI7vlum+bR7 evOvgPdIQcwUCxl+4zue8Xc0RcNVvW5BGRmTvOVZSg8aK1wioekxBHCAuCS3PUY6FYVJ5GC6vAoM KOqquMwc0LnKkiI6QJvYdKosgDnfStwudx65M0C9AkT1nGu07PMOSE4LHzLQiGSqAdnMR8SHKlIQ 6KyFOjghWhwVEE0QJlSfMNrzIhz89NcSqpQgYIFtxUuXNFejEDkhQcybiVGJ2RWNHBM0VJ3FM7Jj FJRHFCaLkVCRPBlERCgQFOyYxI5cYwSNGjJkmdmSpM2OchE7Pg/hg5MGjZQWjDFoxQcizISSMjSZ GQhbuyhrYpYZsDbsDa3BwANwdKJkYgvFJiIlBPS0RFrKsU3NqKlFKqcm8iJgdWQPv4zbjUmS7uZb 2GZmCccPCkJ0iBKtcCYAYkIlJtL6i6rKswVYwq6C2LuxIqWgWlNbLahAoQU9ynBBz2MSNRfC45kY JfIW9Tg+DJsqLhsXLUNsq8HKMUiKGD0C17q19XLFhWLHJOZ0SyulYu3JA4PHiSSXs5Z0rUaBsycG Jy5mxMWZwWHoVIEzZYqTpVuIwJnZIyiIhocsZHKGRRiYwWGORTQpoiOKOWKGDJgcmTFNljJEqVOi xsuZERKGCQ5Q0OeQ/Oh8vz4n0tlweYR9G4ZefDzrwqpXkgKtGbOXl5aEJzHVZdEKMfIVQ5fM6Vmo zdLenpvYQikcHM4hxQnAAe4uCC4uFMmEmXszQeKIiXJjjtKtbDkyh2UAChJJpNCpUhKhc5Ln4amW p6Hl6xZBAUe5kc6LP1ejskYKaOi5slEUc5KHApUES2FFmUciP0ew0CVDC5eEiOChaxAlapsbiwdm SHRkUOC21jLtgiaNmhioVN2IUmLMsae5c4HwUJeeCxgqZ1m5ohfXEYotSxcYsQLCqVNRwMSIETWl VzRIiMcAiVBSIdkAgSMjEBxxSJ0aIhIYcUUqRHOTo5Na4OD2wIiIMpIAuRjwudvJjctV18aDQMtW 30UsImxlUenZZ774UsdZM2hFxcRLu+qaiX8vHzDSO257OEd7HpACUCBECqUEpuw0mBIxKbM8MSqL ESnF3G+pDqowKyOjOOYKlA073VVzSgLofZcsRgVHELDgjwlWp6BdwWDDvEjBYMbs4IyRD2FJJGSc jH79ki5o9edSKdFjR2WOChg0rK3J9LmD5zKeO3kfilylyQKewInI9isZzI6JkhRiQgbkLwVOCiky gxQcOSZ7DHsepAnJScjIjbtgWFBdOVjiIgVkh273iSRtwEL17wwBeVukAnArhq3IsCp2qp2iFPaK jEAUvuL4GEUZuewMzMMYuV0Q6Jx4+8cwgn9U98kDr6Yr80CiLBVBFZFjOCyqgiDD2JfbSVhL8ISC GMUEYoKqirFixEFUFRWRURVirFVRRRVFBEUUWKorEVgi9/7qh690lnVMr/QEWU+4GmQKtKhlIclY hGIQIUCIYg/jVOr9bPxpQIAhEqFDPCEjzCkhALQJrJJwGo+IkBoKUCzb3xoqIqCCoqiIiCDBBGIx RVVEVVRFVWMUFkCIaLJoAwwYCIijQgNLEERJzQULCmtgKa6j5CgLLPOsRNcNIEIpAfF0TJglZASP XCzwoTgQiVdxWfPeUHsZek7yJe5eYW1TrFT0IFSg3+9hSWnUyKC4gcgRGLmDJ9zKASKkTQ4VP0GG FIn7FzBg5KBogVM1FcoSOT9iBcUYwVLkhyRciKMXPoJQc0elhk9P7fB0clS5MqgoSOzJoyZHOCqb QP7AidlDoqOKe3tX18iAQ/VeSxU0GgpHE4xgXGkmNhuAFcK76g5vMGFSx5eHTrUKkhVnSHgoW97M aDdIVT9g+q/gg0Ip8yYeswtEx+zOQGJZYBEnv60BiBYp6NdaSDNfdvdegKzL15ECsuLB5zORNM7m ZHpUsig/IYmVrE/eO7lj7mA0cGSoxEY4JhQuclERyAo5jHJyaGqYGc0KbMhyUMkzBEgUJDliRIYx iRyVFOSRzEge+eBdHJUYgKcHBLZEiZLEQtcyVLAiZP0BD6htxezwbJkytA/A603oHjc9/Ld+LLxH yVzN/ygK8hQ6kwIe4x4OxhzH09T4InsKWWhE9iAnqfAKfQvfJEkVMFjB8zRcYiKSMkz6CmyZEiXK DHRkgTHIEDe/S5E4FNkzIwxYgKdIBmrSw0kZaegkhHeBxKysvLzQPNA4cVExmsxHFIGTMDkMHa00 ExAmMTSSEZWPPQcVijlYDHqTIwFSByOUJnufCIHKgqTLlTsoOemCx6lDkGHPQiOULHmiLIh/Ohqn qiKqii+/jHCRgOEwgu1iSprSu9vYqZAh25F8SPHd5SsIECQhOFLYAp6e0gq2ctGec/o0sIGoLgdz iXZRkCY1G45m/q0klVRwHHM5kpUCXM4E5Q0bCJccYqMTFT7/dqkj3MnQ5o+wpk2ZHPcQToqEyox9 Toidlxy59EREPBwcjHffBrVTSaCskbDSYGRhSWFBmJFZBgUm9VTfY4tCgx9ZnyJGTJ5OiR4IljYp E8n8s+wv7FCpyHMSOBgQaykN5wXaQKVwgY/vZdqJS1nL1LO8VL0vZohs9sA8y4zgC2lXpzFSmBTz 9fZ3khB3NjCazUBmajo/l46DBJNWgkBEDkSGhomEJNiEKEUyDWcTaajr1pK/faYm84k01BGbjQpx 5KUlRcUDiYtHFNM5GcF3qc+osti+G3ZYP7u57NnV8n2M/p4nfv72RS1NPZG86bDWOKgecDabzhsD kPNBVKSkpCQsIykoKTA4cPQrOJcSMOkyLyopKi40HA56EU7BU3nEFW0cYAK4AZijWpSAOIUtWkyJ HYGRByecxuip+xCYp0UOxT2IDkjkc8hAPrkQPxQC15W28gCURgaSRERs2X1nSaWccWFw8ikHnQjN JiWn8VEw0LbuDmHUU6DMU2MGRyOgbRCaKQj8tKTQGyAOYAVUd7NAr4oHAEpvkG5POunAZuRRYUse AVMsBFqKWPKSgBUo4i+F7enkcdB5iazcczoSRDSksFOdRCzOZYgXPsH1MkjRIuOXNFT8igiJM0VP t9smS5oY0fcLkDgK1mfcgSM3FsaMERyRIofWIaKFSRwXIkTwosiZMiPEgRNlCxEyZIlRSopYyULG 92Ds+czwYICIhEsYNGxSJ7CpQVvyCbT+yKfZFPcVPKgDebxXwp/uMr5qlyxDlMOOTjJIGTmYYcGk 7thr32ryuvnMQNpA0scbU+qYgVtQGPSpjPuDvP+65itIZw+n11uAR9NEgJEm8VSfjUCpQgZ2ONIh 7NIESkGsPJaLfqCrIIVVzUcPPVnTRpv3j0FRPuHQqFcfU9uYZBYAnNO0VSLHqKWHR8TtFTQVWhb0 evIVS4BA87zC/UFygbJCJ7eAA5lO3kBX+vtRbwwIISER6/YDs9LidpuAXBx3EQw70fzSGDU6bO9b BjAyRIYKOjKQKvX4QG9J3KTPid/EMBPDASSJX5z/XCH19Ru2UZDVXBUGo1BrFdyA7odY+twh+WYJ m0Mu18UyFU8/rwF1hIgkLJd7qx2hxVSbTMYNlVgG7l9BTfxRTEU7UgAJIphQCroAmKne5ZxW78gN 53ydPNrq+gZxy3rvQMbwuuDgGs32fNO/TlP5Rf5nuqkIpoV1kNsNi3ivdPx73z7jSZwj4kyM4qZn mq9c/xu84o6Ho4SUDhoo11bAAOojkqu4VOzQQYaOPqTt7SJqpAlgUKhOcAp8hiKp6O2kVK1CAr+B U9UCQic0CyqeqABzk0PVkWUKSCOJAGb0/RJyDcOAe49FDBBthGIRIhhBC5FIc0CjD+QqlL1+2N4Y dVoClu/gRzCQATAkrInCFGFgDBhxBcOPHUqvpJFOAGBr2m3QNAezRqdIKuAAzXzGkICADxia0Bua FDMccwfJS70K2gFXOnbPACXDcKvkHAQ4Ejb98117Bfl8fOPljJDd2gbB0gYExKEU9/f2VTe0gh5X CpYqpFwS1gq/wCrg9gH0NXXg2+bqDADnxnkBr6v++ofUVkRIiiIIIe+VGMmS9hMsMBpi9gZhifWG sEvjpX446o/cihH77M/ar1QOV+hcOyCIg8nS+2MdJ81CFFYF+cPWYaiBCkAcLrwO7tUqRDIMdxYI OEpPGr1S25ziqQB+xz6B+M6KdIaL1DMEHuN9yviqX04fmSHQEOo5ZsyqZiA5Ga9S4IWyAURAD3Bh kE7TsmbT6ST9zPlNTzByh82uDLRykTYKFkQQHnSnH8n1qrIjMQHMn9/ofOb7239B064FTeKPmHtn AWaKZ1U0fcR8w4HAFXuDkYbChIbmKcQBvDJAxJw7enH1yMUD3oxSLIsgpFgKKAJ7VoMsk+CeT4Ph 0Dz+GHWGGtmsMt1hhZhswtolRTTQyKCgmA7ejqDsCCv+QjDLKvOYihcXFDGGdnY0IpJJBJSkKGdQ ilRScxHN96Hooc/wNAfTw7pwnSjSi0tpSlPfc7md4dgp4xinPTmp9Ik0qhtEUplxftrvDLAzGy3y SexEbns0O3qGYDRqVrbiIIL+yGRMlBJUiEqSyDQeQlIwLkkkWa8ghmX/ckHnUIM/E9rFiiyKKKp2 pUFFBYsUWRYoqyLFUUFFFBRaNYqxQWLFixYsUFFiinZpkkPYIXsb9YdvjkswhAEl8tM9b7RJKTqs QKMTgE2YFjnC0KSgO6YhqVxDSl76Q9/UFo8HQlxhzAS4is1lDuO2l+F+XQSWKt1F3hbFqELb7aQs uThXadoc5yPIauie+SrslRmdQXYCqcw9E/l8TDOdQxFU3Aut7sVADAKA5bo08u7lfGKlrDLq9RVL NLuqzVgmwNzJn3Y1lrQtA/+Oaitqrh8Z5gVgA8QXPLeHGAXwCp0avOrdvaTdSElwgXBbOrp+C474 cNFujUqV2F/4u5IpwoSAfKRQUA==