Changeset 459339
- Timestamp:
- 11/04/2011 05:24:59 AM (14 years ago)
- Location:
- dukapress/trunk
- Files:
-
- 4 edited
-
css/dp-admin.css (modified) (1 diff)
-
css/dpsc-basic.css (modified) (1 diff)
-
dukapress.php (modified) (2 diffs)
-
php/dp-cart.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
dukapress/trunk/css/dp-admin.css
r341872 r459339 89 89 90 90 .dp_pagination:hover {color: #D54E21; border-bottom-color:#999999;} 91 92 93 table.order_log_info{ 94 width:auto; 95 table-layout: fixed; 96 } 97 98 table.order_log_info td{ 99 width:200px; 100 } -
dukapress/trunk/css/dpsc-basic.css
r320051 r459339 77 77 .dpsc-mini-shopping-cart.aligncenter a{text-transform: uppercase;font-weight: bold;color: #000;clear: both;display: block} 78 78 .dpsc_error_msg{color:red;font-size:11px;font-weight:bold;letter-spacing:1px;margin-left:5px;} 79 80 table.thankyou_detail{ 81 width:100%; 82 } 83 table.thankyou{ 84 width:auto; float:right; 85 } 86 table.thankyou th{ 87 width:100px; 88 font-weight:bold 89 } 90 table.thankyou .thankyou_info{text-align:right; font-weight:normal !important;} 91 92 table.order_log_info{ 93 width:auto; 94 } 95 table.order_log_info th{ 96 width:200px; 97 } -
dukapress/trunk/dukapress.php
r458897 r459339 724 724 <td><?php _e("Country:","dp-lang");?> </td><td><?php _e($dpsc_country_code_name[$result->billing_country], "dp-lang") ;?></td> 725 725 </tr> 726 <tr> 727 <td><?php _e("Email:","dp-lang");?> </td><td><?php _e($result->billing_email, "dp-lang") ;?></td> 728 </tr> 726 729 </table> 727 <?php if( $shipping) { ?>730 <?php if(!$shipping) { ?> 728 731 <h4><?php _e("Shipping Address:","dp-lang");?></h4> 729 732 <table class="order_log_info"> … … 749 752 <td><?php _e("Country:","dp-lang");?> </td><td><?php _e($dpsc_country_code_name[$result->shipping_country], "dp-lang") ;?></td> 750 753 </tr> 754 751 755 </table> 752 756 <?php } ?> -
dukapress/trunk/php/dp-cart.php
r458897 r459339 1434 1434 $shipping = $result->shipping; 1435 1435 $discount = $result->discount; 1436 $tax= $result->tax; 1436 1437 if ($discount > 0) { 1437 1438 $total_discount = $total * $discount / 100; … … 1447 1448 $product_details = unserialize($result->products); 1448 1449 foreach ($product_details as $product) { 1450 $price = number_format((float) $product['price'], 2, '.', ''); 1449 1451 $order_detail_table .= '<tr> 1450 1452 <td>' . __($product['name'], "dp-lang") . '</td> 1451 1453 <td>' . __($product['quantity'], "dp-lang") . '</td> 1452 <td>' . $currency.' '.__($pr oduct['price'], "dp-lang") . '</td>1454 <td>' . $currency.' '.__($price, "dp-lang") . '</td> 1453 1455 </tr>'; 1454 1456 } … … 1458 1460 <tr> 1459 1461 <th>' . __('Price', "dp-lang") . '</th> 1460 <th class="thankyou_info">' . $currency. ' ' . $total. '</th>1462 <th class="thankyou_info">' . $currency. ' ' .number_format((float) $total, 2, '.', ''). '</th> 1461 1463 </tr> 1462 1464 <tr> 1463 1465 <th>' . __('Shipping', "dp-lang") . '</th> 1464 <th class="thankyou_info"> ' .$shipping. '</th>1466 <th class="thankyou_info"> + ' .number_format((float) $shipping, 2, '.', '') . '</th> 1465 1467 </tr> 1466 1468 <tr> 1467 1469 <th>' . __('Discount', "dp-lang") . '</th> 1468 <th class="thankyou_info">' .$discount . '</th> 1470 <th class="thankyou_info"> -' .number_format((float) $discount, 2, '.', '') . '</th> 1471 </tr> 1472 <tr> 1473 <th>' . __('Tax', "dp-lang") . '</th> 1474 <th class="thankyou_info"> + ' .number_format((float) $total_tax, 2, '.', '') . '</th> 1469 1475 </tr> 1470 1476 <tr> 1471 1477 <th>' . __('Total', "dp-lang") . '</th> 1472 <th class="thankyou_info">' . $currency. ' '. $amount. '</th>1478 <th class="thankyou_info">' . $currency. ' '. number_format((float) $amount, 2, '.', ''). '</th> 1473 1479 </tr> 1474 1480 </table>';
Note: See TracChangeset
for help on using the changeset viewer.