WP eCommerce - Version 3.8.RC.2

Version Description

Release Info

Developer	valentinas
Plugin	WP eCommerce
Version	3.8.RC.2
Comparing to
See all releases

Code changes from version 3.8.RC.1 to 3.8.RC.2

Files changed (84) hide show

wp-shopping-cart.php +1 -1
wpsc-admin/admin-form-functions.php +77 -118
wpsc-admin/admin.php +114 -52
wpsc-admin/ajax-and-init.php +33 -284
wpsc-admin/css/admin.css +4 -4
wpsc-admin/display-coupons.php +7 -7
wpsc-admin/display-groups.page.php +0 -7
wpsc-admin/display-items.page.php +22 -28
wpsc-admin/display-options-settings.page.php +23 -23
wpsc-admin/display-sales-logs.php +39 -131
wpsc-admin/display-update.page.php +1 -1
wpsc-admin/display-upgrades.page.php +2 -2
wpsc-admin/display-variations.page.php +0 -241
wpsc-admin/includes/display-items-functions.php +182 -126
wpsc-admin/includes/product-functions.php +84 -39
wpsc-admin/includes/products.php +24 -41
wpsc-admin/includes/purchlogs_upgrade.php +21 -21
wpsc-admin/includes/save-data.functions.php +11 -67
wpsc-admin/includes/settings-pages/admin.php +14 -17
wpsc-admin/includes/settings-pages/checkout.php +20 -20
wpsc-admin/includes/settings-pages/gateway.php +8 -17
wpsc-admin/includes/settings-pages/general.php +16 -18
wpsc-admin/includes/settings-pages/import.php +29 -29
wpsc-admin/includes/settings-pages/marketing.php +1 -1
wpsc-admin/includes/settings-pages/presentation.php +30 -42
wpsc-admin/includes/settings-pages/shipping.php +20 -21
wpsc-admin/includes/settings-pages/taxes.php +16 -16
wpsc-admin/includes/updating-functions.php +7 -7
wpsc-admin/js/admin-legacy.js +0 -46
wpsc-admin/js/admin.js +8 -9
wpsc-core/js/tinymce3/window.php +4 -4
wpsc-core/js/wp-e-commerce.js +22 -14
wpsc-core/wpsc-constants.php +1 -1
wpsc-core/wpsc-deprecated.php +29 -90
wpsc-core/wpsc-functions.php +90 -23
wpsc-core/wpsc-includes.php +3 -0
wpsc-core/wpsc-installer.php +8 -3
wpsc-includes/ajax.functions.php +15 -15
wpsc-includes/breadcrumbs.class.php +7 -8
wpsc-includes/cart.class.php +55 -82
wpsc-includes/category.functions.php +58 -51
wpsc-includes/checkout.class.php +23 -31
wpsc-includes/display.functions.php +2 -57
wpsc-includes/meta.functions.php +6 -8
wpsc-includes/misc.functions.php +8 -8
wpsc-includes/processing.functions.php +10 -26
wpsc-includes/product-template.php +126 -62
wpsc-includes/purchaselogs.class.php +53 -52
wpsc-includes/shipping.helper.php +585 -0
wpsc-includes/shopping_cart_functions.php +3 -3
wpsc-includes/theme.functions.php +43 -25
wpsc-includes/upgrades.php +3 -3
wpsc-includes/variations.class.php +4 -4
wpsc-languages/wpsc.pot +2587 -1226
wpsc-merchants/GoogleCheckout-XML.php +18 -16
wpsc-merchants/paypal-express.merchant.php +23 -23
wpsc-merchants/paypal-pro.merchant.php +12 -12
wpsc-shipping/australiapost.php +1 -0
wpsc-shipping/flatrate.php +15 -15
wpsc-shipping/tablerate.php +5 -5
wpsc-shipping/{ups.php → ups_20.php} +216 -96
wpsc-shipping/usps.php +0 -449
wpsc-shipping/usps_20.php +927 -0
wpsc-shipping/weightrate.php +6 -8
wpsc-taxes/controllers/taxes_controller.class.php +6 -5
wpsc-taxes/models/taxes.class.php +1 -0
wpsc-taxes/taxes_module.php +11 -6
wpsc-theme/functions/wpsc-transaction_results_functions.php +8 -5
wpsc-theme/functions/wpsc-user_log_functions.php +9 -9
wpsc-theme/wpsc-cart_widget.php +3 -3
wpsc-theme/wpsc-category_widget.php +2 -2
wpsc-theme/wpsc-default.css +1 -67
wpsc-theme/wpsc-shopping_cart_page.php +12 -14
wpsc-theme/wpsc-user-log.php +1 -1
wpsc-updates/currency_list.php +241 -241
wpsc-widgets/admin_menu_widget.php +3 -4
wpsc-widgets/category_widget.php +2 -2
wpsc-widgets/donations_widget.php +4 -4
wpsc-widgets/latest_product_widget.php +2 -2
wpsc-widgets/price_range_widget.php +2 -2
wpsc-widgets/product_tag_widget.php +2 -2
wpsc-widgets/shopping_cart_widget.php +3 -3
wpsc-widgets/specials_widget.php +3 -3
wpsc-widgets/tagging_functions.php +1 -1

wp-shopping-cart.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	Plugin Name: WP e-Commerce
5	Plugin URI: http://getshopped.org/
6	Description: A plugin that provides a WordPress Shopping Cart. See also: <a href="http://getshopped.org" target="_blank">GetShopped.org</a> \| <a href="http://getshopped.org/forums/" target="_blank">Support Forum</a> \| <a href="http://getshopped.org/resources/docs/" target="_blank">Documentation</a>
7	- Version: 3.8 ~~Development~~
8	Author: Instinct Entertainment
9	Author URI: http://getshopped.org/
10	*/


4	Plugin Name: WP e-Commerce
5	Plugin URI: http://getshopped.org/
6	Description: A plugin that provides a WordPress Shopping Cart. See also: <a href="http://getshopped.org" target="_blank">GetShopped.org</a> \| <a href="http://getshopped.org/forums/" target="_blank">Support Forum</a> \| <a href="http://getshopped.org/resources/docs/" target="_blank">Documentation</a>
7	+ Version: 3.8.RC.2
8	Author: Instinct Entertainment
9	Author URI: http://getshopped.org/
10	*/

wpsc-admin/admin-form-functions.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	function coupon_edit_form($coupon) {
3
4	- $conditions = ~~unserialize~~($coupon['condition']);
5
6	$start_timestamp = strtotime($coupon['start']);
7	$end_timestamp = strtotime($coupon['expiry']);
	@@ -30,7 +30,7 @@ $conditions = unserialize($coupon['condition']);
30	$output .= " <select name='edit_coupon[".$id."][is-percentage]'>";
31	$output .= " <option value='0' ".(($coupon['is-percentage'] == 0) ? "selected='true'" : '')." >$</option>\n\r";//
32	$output .= " <option value='1' ".(($coupon['is-percentage'] == 1) ? "selected='true'" : '')." >%</option>\n\r";
33	- $output .= " <option value='2' ".(($coupon['is-percentage'] == 2) ? "selected='true'" : '')." >Free shipping</option>\n\r";
34	$output .= " </select>\n\r";
35	$output .= " </td>\n\r";
36	$output .= " <td>\n\r";
	@@ -61,20 +61,20 @@ $conditions = unserialize($coupon['condition']);
61	if($conditions != null){
62	$output .= "<tr>";
63	$output .= "<th>";
64	- $output .= "Conditions";
65	$output .= "</th>";
66	$output .= "</tr>";
67	$output .= "<th>";
68	- $output .= "Delete";
69	$output .= "</th>";
70	$output .= "<th>";
71	- $output .= "Property";
72	$output .= "</th>";
73	$output .= "<th>";
74	- $output .= "Logic";
75	$output .= "</th>";
76	$output .= "<th>";
77	- $output .= "Value";
78	$output .= "</th>";
79	$output .= " </tr>\n\r";
80	$i=0;
	@@ -83,7 +83,7 @@ $conditions = unserialize($coupon['condition']);
83	$output .= "<td>";
84	$output .= "<input type='hidden' name='coupon_id' value='".$id."' />";
85	$output .= "<input type='submit' id='delete_condition".$i."' style='display:none;' value='".$i."' name='delete_condition' />";
86	- $output .= "<span style='cursor:pointer;' class='delete_button' onclick='jQuery(\"#delete_condition".$i."\").click()'>Delete</span>";
87	$output .= "</td>";
88	$output .= "<td>";
89	$output .= $condition['property'];
	@@ -114,25 +114,25 @@ function wpsc_coupons_conditions($id){
114
115	$output ='
116	<input type="hidden" name="coupon_id" value="'.$id.'" />
117	- <tr><td colspan="3"><b>Add Conditions</b></td></tr>
118	<tr><td colspan="6">
119	<div class="coupon_condition">
120	<div>
121	<select class="ruleprops" name="rules[property][]">
122	- <option value="item_name" rel="order">Item name</option>
123	- <option value="item_quantity" rel="order">Item quantity</option>
124	- <option value="total_quantity" rel="order">Total quantity</option>
125	- <option value="subtotal_amount" rel="order">Subtotal amount</option>
126	' . apply_filters( 'wpsc_coupon_rule_property_options', '' ) . '
127	</select>
128	<select name="rules[logic][]">
129	- <option value="equal">Is equal to</option>
130	- <option value="greater">Is greater than</option>
131	- <option value="less">Is less than</option>
132	- <option value="contains">Contains</option>
133	- <option value="not_contain">Does not contain</option>
134	- <option value="begins">Begins with</option>
135	- <option value="ends">Ends with</option>
136	</select>
137	<span>
138	<input type="text" name="rules[value][]"/>
	@@ -177,7 +177,7 @@ function setting_button(){
177	}
178
179	function wpsc_right_now() {
180	- global $wpdb~~,$nzshpcrt_imagesize_info~~;
181	$year = date("Y");
182	$month = date("m");
183	$start_timestamp = mktime(0, 0, 0, $month, 1, $year);
	@@ -185,106 +185,65 @@ function wpsc_right_now() {
185	$product_count = $wpdb->get_var("SELECT COUNT(*)
186	FROM `".$wpdb->posts."`
187	WHERE `post_status` = 'publish'
188	- AND `post_type` IN ('wpsc-product')"
189	);
190	- $replace_values[":productcount:"] = $product_count;
191	- $replace_values[":productcount:"] .= " ".(($replace_values[":productcount:"] == 1) ? __('product', 'wpsc') : __('products', 'wpsc'));
192	- $product_unit = (($replace_values[":productcount:"] == 1) ? __('product', 'wpsc') : __('products', 'wpsc'));
193	$group_count = count(get_terms("wpsc_product_category"));
194	- $replace_values[":groupcount:"] = $group_count;
195	- $replace_values[":groupcount:"] .= " ".(($replace_values[":groupcount:"] == 1) ? __('group', 'wpsc') : __('groups', 'wpsc'));
196	- $group_unit = (($replace_values[":groupcount:"] == 1) ? __('group', 'wpsc') : __('groups', 'wpsc'));
197	$sales_count = $wpdb->get_var("SELECT COUNT(*) FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE `date` BETWEEN '".$start_timestamp."' AND '".$end_timestamp."'");
198	- $~~replace_values[":salecount:"]~~ = ~~$sales_count.~~ ~~" ".~~(~~(isset($replace_values[":salecount:"])~~ ~~&& (~~$~~replace_values[":salecount:"]~~ ~~== 1~~)) ~~? __('sale', 'wpsc'~~) ~~: __('sales', 'wpsc'))~~;
199	- $~~sales_unit~~ = (~~($replace_values[":salecount:"]~~ ~~== 1) ? __~~(~~'sale', 'wpsc'~~) ~~: __('sales', 'wpsc'~~));
200	- $replace_values[":monthtotal:"] = wpsc_currency_display( admin_display_total_price( $start_timestamp,$end_timestamp ) );
201	- $replace_values[":overaltotal:"] = wpsc_currency_display( admin_display_total_price() );
202	$variation_count = count(get_terms("wpsc-variation", array('parent' => 0)));
203	- $variation_unit = (($variation_count == 1) ? __('variation', 'wpsc') : __('variations', 'wpsc'));
204	- $replace_values[":pendingcount:"] = $wpdb->get_var("SELECT COUNT(*) FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE `processed` IN ('1')");
205	$pending_sales = $wpdb->get_var("SELECT COUNT(*) FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE `processed` IN ('1')");
206	- $replace_values[":pendingcount:"] .= " " . (($replace_values[":pendingcount:"] == 1) ? __('transaction', 'wpsc') : __('transactions', 'wpsc'));
207	- $pending_sales_unit = (($replace_values[":pendingcount:"] == 1) ? __('transaction', 'wpsc') : __('transactions', 'wpsc'));
208	$accept_sales = $wpdb->get_var("SELECT COUNT(*) FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE `processed` IN ('2' ,'3', '4')");
209	- $~~accept_sales_unit~~ = (~~($accept_sales == 1) ? __(~~'~~transaction~~'~~, 'wpsc'~~) ~~: __('transactions', 'wpsc'))~~;
210	- ~~$replace_values[":theme:"] = get_option('wpsc_selected_theme');~~
211	- ~~$replace_values[":versionnumber:"]~~ = ~~WPSC_PRESENTABLE_VERSION;~~
212	- if (~~function_exists(~~'~~add_object_page~~')) {
213	- ~~$output~~="";
214	- ~~$output.="~~<~~div~~ ~~id='dashboard_right_now'~~ class='~~postbox~~'>";
215	- ~~$output.="~~ <h3 class='~~hndle~~'>";
216	- ~~$output.=" <span>".__('Current~~ ~~Month',~~ ~~'wpsc')."</span>"~~;
217	- ~~$output.=" <br class='clear'/>";~~
218	- ~~$output.=" </h3~~>";
219	- $~~output~~ .= ~~"<div~~ ~~class=~~'~~inside~~'>";
220	- ~~$output .= "<div class='table'~~>";
221	- ~~$output .= "~~<p class='~~sub~~'>~~".__('At a Glance', 'wpsc')."</p>";~~
222	- ~~$output~~ .= ~~"<table~~ ~~style='border-top:1px solid #ececec;'>";~~
223	- ~~$output .= "<tr class='first'~~>";
224	- ~~$output .= "~~<td class='~~first b~~'>";
225	- $~~output~~ .= ~~"<a~~ ~~href=~~'~~?page=~~wpsc~~-edit-products~~'~~>".$product_count."</a>"~~;
226	- ~~$output .= "~~</td>";
227	- ~~$output .= "<td class='t'~~>";
228	- ~~$output .= ucfirst($product_unit);~~
229	- ~~$output~~ .= ~~"</td~~>";
230	- ~~$output~~ .= ~~"<td~~ ~~class='b'>";~~
231	- ~~$output .= "<a href='?page=wpsc-sales-logs'>".$sales_count."~~</a>";
232	- ~~$output~~ ~~.= "</td~~>";
233	- $~~output~~ .= ~~"<td~~ ~~class=~~'~~last~~'>";
234	- ~~$output .= ucfirst($sales_unit);~~
235	- ~~$output~~ ~~.= "</td~~>";
236	- ~~$output~~ .= ~~"</tr>"~~;
237	- ~~$output .= "<tr~~>";
238	- ~~$output .= "~~<td class='~~first~~ b'>";
239	- ~~$output~~ .= ~~"<a~~ ~~href=~~'~~?page=~~wpsc~~-edit-groups~~'~~>".$group_count."</a>"~~;
240	- ~~$output .= "~~</td>";
241	- ~~$output .= "<td class='t'~~>";
242	- ~~$output .= ucfirst($group_unit);~~
243	- ~~$output~~ .= ~~"</td~~>";
244	- ~~$output~~ .= ~~"<td~~ ~~class='b'>";~~
245	- ~~$output .= "<a href='?page=wpsc-sales-logs'>".$pending_sales."~~</a>";
246	- ~~$output~~ ~~.= "</td~~>";
247	- ~~$output~~ .= ~~"<td~~ ~~class=~~'~~last~~ t ~~waiting~~'~~>".__(~~'~~Pending'~~, 'wpsc')." ";
248	- ~~$output .= ucfirst($pending_sales_unit);~~
249	- ~~$output~~ ~~.= "</td~~>";
250	- ~~$output~~ .= ~~"</tr>"~~;
251	- ~~$output .= "<tr~~>";
252	- ~~$output .= "~~<td class='~~first~~ b'>";
253	- ~~$output~~ .= ~~"<a~~ ~~href=~~'~~?page=~~wpsc~~-edit-variations~~'~~>".$variation_count."</a>"~~;
254	- ~~$output .= "~~</td>";
255	- ~~$output .= "<td class='t'~~>";
256	- ~~$output .= ucfirst($variation_unit);~~
257	- ~~$output .= "~~</td>";
258	- ~~$output .= "<td class='b'>";~~
259	- $output .= "<a href='?page=wpsc-sales-logs'>".$accept_sales."</a>";
260	- $output .= "</td>";
261	- $output .= "<td class='last t approved'>".__('Closed', 'wpsc')." ";
262	- $output .= ucfirst($accept_sales_unit);
263	- $output .= "</td>";
264	- $output .= "</tr>";
265	- $output .= "</table>";
266	- $output .= "</div>";
267	- $output .= "<div class='versions'>";
268	- $output .= "<p><a class='button rbutton' href='admin.php?page=wpsc-edit-products'><strong>".__('Add New Product', 'wpsc')."</strong></a>".__('Here you can add products, groups or variations', 'wpsc')."</p>";
269	- $output .= "</div>";
270	- $output .= "</div>";
271	- $output.="</div>";
272	- } else {
273	- $output="";
274	- $output.="<div id='rightnow'>\n\r";
275	- $output.=" <h3 class='reallynow'>\n\r";
276	- $output.=" <a class='rbutton' href='admin.php?page=wpsc-edit-products'><strong>".__('Add New Product', 'wpsc')."</strong></a>\n\r";
277	- $output.=" <span>"._('Right Now')."</span>\n\r";
278	- $output.=" </h3>\n\r";
279	- $output.="<p class='youhave'>".__('You have <a href="admin.php?page=wpsc-edit-products">:productcount:</a>, contained within <a href="admin.php?page=wpsc-edit-groups">:groupcount:</a>. This month you made :salecount: and generated a total of :monthtotal: and your total sales ever is :overaltotal:. You have :pendingcount: awaiting approval.', 'wpsc')."</p>\n\r";
280	- $output.=" <p class='youare'>\n\r";
281	- $output.=" ".__('You are using the :theme: style. This is WP e-Commerce :versionnumber:.', 'wpsc')."\n\r";
282	- $output.=" </p>\n\r";
283	- $output.="</div>\n\r";
284	- $output.="<br />\n\r";
285	- $output = str_replace(array_keys($replace_values), array_values($replace_values),$output);
286	- }
287	- return $output;
288	}
289
290
	@@ -365,7 +324,7 @@ function wpsc_packing_slip($purchase_id) {
365	if ($form_field['name']=="State" && !empty($purch_data['billing_region']) \|\| $form_field['name']=="State" && !empty($purch_data['billing_region']))
366	echo "";
367	else
368	- echo " <tr><td>".wp_kses($form_field['name'], array() ).":</td><td>".htmlentities(stripslashes($rekeyed_input[$form_field['id']]['value'], 'UTF-8')~~, ENT_QUOTES)~~."</td></tr>\n\r";
369
370	}
371
	@@ -391,7 +350,7 @@ function wpsc_packing_slip($purchase_id) {
391	$gateway_name = $gateway['name'];
392	}
393	} else {
394	- $gateway_name = "Manual Payment";
395	}
396	}
397	}
	@@ -412,7 +371,7 @@ function wpsc_packing_slip($purchase_id) {
412	echo " <th>".__('Price', 'wpsc')." </th>";
413
414	echo " <th>".__('Shipping', 'wpsc')." </th>";
415	- echo '<th>Tax</th>';
416	echo '</tr>';
417	$endtotal = 0;
418	$all_donations = true;


1	<?php
2	function coupon_edit_form($coupon) {
3
4	+ $conditions = maybe_unserialize($coupon['condition']);
5
6	$start_timestamp = strtotime($coupon['start']);
7	$end_timestamp = strtotime($coupon['expiry']);

30	$output .= " <select name='edit_coupon[".$id."][is-percentage]'>";
31	$output .= " <option value='0' ".(($coupon['is-percentage'] == 0) ? "selected='true'" : '')." >$</option>\n\r";//
32	$output .= " <option value='1' ".(($coupon['is-percentage'] == 1) ? "selected='true'" : '')." >%</option>\n\r";
33	+ $output .= " <option value='2' ".(($coupon['is-percentage'] == 2) ? "selected='true'" : '')." >" . __( 'Free shipping', 'wpsc' ) . "'</option>\n\r";
34	$output .= " </select>\n\r";
35	$output .= " </td>\n\r";
36	$output .= " <td>\n\r";

61	if($conditions != null){
62	$output .= "<tr>";
63	$output .= "<th>";
64	+ $output .= __("Conditions", 'wpsc');
65	$output .= "</th>";
66	$output .= "</tr>";
67	$output .= "<th>";
68	+ $output .= __("Delete", 'wpsc');
69	$output .= "</th>";
70	$output .= "<th>";
71	+ $output .= __("Property", 'wpsc');
72	$output .= "</th>";
73	$output .= "<th>";
74	+ $output .= __("Logic", 'wpsc');
75	$output .= "</th>";
76	$output .= "<th>";
77	+ $output .= __("Value", 'wpsc');
78	$output .= "</th>";
79	$output .= " </tr>\n\r";
80	$i=0;

83	$output .= "<td>";
84	$output .= "<input type='hidden' name='coupon_id' value='".$id."' />";
85	$output .= "<input type='submit' id='delete_condition".$i."' style='display:none;' value='".$i."' name='delete_condition' />";
86	+ $output .= "<span style='cursor:pointer;' class='delete_button' onclick='jQuery(\"#delete_condition".$i."\").click()'>" . __('Delete', 'wpsc' ) . "</span>";
87	$output .= "</td>";
88	$output .= "<td>";
89	$output .= $condition['property'];

114
115	$output ='
116	<input type="hidden" name="coupon_id" value="'.$id.'" />
117	+ <tr><td colspan="3"><b>' . __( 'Add Conditions', 'wpsc') . '</b></td></tr>
118	<tr><td colspan="6">
119	<div class="coupon_condition">
120	<div>
121	<select class="ruleprops" name="rules[property][]">
122	+ <option value="item_name" rel="order">' . __( 'Item name', 'wpsc') . '</option>
123	+ <option value="item_quantity" rel="order">' . __( 'Item quantity', 'wpsc') . '</option>
124	+ <option value="total_quantity" rel="order">' . __( 'Total quantity', 'wpsc') . '</option>
125	+ <option value="subtotal_amount" rel="order">' . __( 'Subtotal amount', 'wpsc') . '</option>
126	' . apply_filters( 'wpsc_coupon_rule_property_options', '' ) . '
127	</select>
128	<select name="rules[logic][]">
129	+ <option value="equal">' . __( 'Is equal to', 'wpsc') . '</option>
130	+ <option value="greater">' . __( 'Is greater than', 'wpsc') . '</option>
131	+ <option value="less">' . __( 'Is less than', 'wpsc') . '</option>
132	+ <option value="contains">' . __( 'Contains', 'wpsc') . '</option>
133	+ <option value="not_contain">' . __( 'Does not contain', 'wpsc') . '</option>
134	+ <option value="begins">' . __( 'Begins with', 'wpsc') . '</option>
135	+ <option value="ends">' . __( 'Ends with', 'wpsc') . '</option>
136	</select>
137	<span>
138	<input type="text" name="rules[value][]"/>

177	}
178
179	function wpsc_right_now() {
180	+ global $wpdb;
181	$year = date("Y");
182	$month = date("m");
183	$start_timestamp = mktime(0, 0, 0, $month, 1, $year);

185	$product_count = $wpdb->get_var("SELECT COUNT(*)
186	FROM `".$wpdb->posts."`
187	WHERE `post_status` = 'publish'
188	+ AND `post_type` = 'wpsc-product'"
189	);



190	$group_count = count(get_terms("wpsc_product_category"));



191	$sales_count = $wpdb->get_var("SELECT COUNT(*) FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE `date` BETWEEN '".$start_timestamp."' AND '".$end_timestamp."'");
192	+ $monthtotal = wpsc_currency_display( admin_display_total_price( $start_timestamp,$end_timestamp ) );
193	+ $overaltotal = wpsc_currency_display( admin_display_total_price() );


194	$variation_count = count(get_terms("wpsc-variation", array('parent' => 0)));


195	$pending_sales = $wpdb->get_var("SELECT COUNT(*) FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE `processed` IN ('1')");


196	$accept_sales = $wpdb->get_var("SELECT COUNT(*) FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE `processed` IN ('2' ,'3', '4')");
197	+ $theme = get_option('wpsc_selected_theme');
198	+ ?>
199	+ <div class='table'>
200	+ <p class='sub'><?php _e('At a Glance', 'wpsc'); ?></p>
201	+ <table style='border-top:1px solid #ececec;'>
202	+ <tr class='first'>
203	+ <td class='first b'>
204	+ <?php echo $product_count; ?>
205	+ </td>
206	+ <td class='t'>
207	+ <?php echo _nx( 'Product', 'Products', $product_count, 'dashboard widget', 'wpsc' ); ?>
208	+ </td>
209	+ <td class='b'>
210	+ <?php echo $sales_count; ?>
211	+ </td>
212	+ <td class='last'>
213	+ <?php echo _nx('Sale', 'Sales', $sales_count, 'dashboard widget', 'wpsc'); ?>
214	+ </td>
215	+ </tr>
216	+ <tr>
217	+ <td class='first b'>
218	+ <?php echo $group_count; ?>
219	+ </td>
220	+ <td class='t'>
221	+ <?php echo _nx('Category', 'Categories', $group_count, 'dashboard widget', 'wpsc'); ?>
222	+ </td>
223	+ <td class='b'>
224	+ <?php echo $pending_sales; ?>
225	+ </td>
226	+ <td class='last t waiting'>
227	+ <?php echo _n('Pending sale', 'Pending sales', $pending_sales, 'wpsc'); ?>
228	+ </td>
229	+ </tr>
230	+ <tr>
231	+ <td class='first b'>
232	+ <?php echo $variation_count; ?>
233	+ </td>
234	+ <td class='t'>
235	+ <?php echo _nx('Variation', 'Variations', $variation_count, 'dashboard widget', 'wpsc'); ?>
236	+ </td>
237	+ <td class='b'>
238	+ <?php echo $accept_sales; ?>
239	+ </td>
240	+ <td class='last t approved'>
241	+ <?php echo _n('Closed sale', 'Closed sales', $accept_sales, 'wpsc'); ?>
242	+ </td>
243	+ </tr>
244	+ </table>
245	+ </div>
246	+ <?php





























247	}
248
249

324	if ($form_field['name']=="State" && !empty($purch_data['billing_region']) \|\| $form_field['name']=="State" && !empty($purch_data['billing_region']))
325	echo "";
326	else
327	+ echo " <tr><td>".wp_kses($form_field['name'], array() ).":</td><td>".htmlentities(stripslashes($rekeyed_input[$form_field['id']]['value']), ENT_QUOTES, 'UTF-8')."</td></tr>\n\r";
328
329	}
330

350	$gateway_name = $gateway['name'];
351	}
352	} else {
353	+ $gateway_name = __('Manual Payment', 'wpsc');
354	}
355	}
356	}

371	echo " <th>".__('Price', 'wpsc')." </th>";
372
373	echo " <th>".__('Shipping', 'wpsc')." </th>";
374	+ echo '<th>' . __('Tax', 'wpsc') . '</th>';
375	echo '</tr>';
376	$endtotal = 0;
377	$all_donations = true;

wpsc-admin/admin.php CHANGED Viewed

	@@ -11,8 +11,6 @@
11	// admin includes
12	require_once( WPSC_FILE_PATH . '/wpsc-admin/display-update.page.php' );
13	require_once( WPSC_FILE_PATH . '/wpsc-admin/display-items.page.php' );
14	- require_once( WPSC_FILE_PATH . '/wpsc-admin/display-groups.page.php' );
15	- require_once( WPSC_FILE_PATH . '/wpsc-admin/display-variations.page.php' );
16	require_once( WPSC_FILE_PATH . '/wpsc-admin/display-upgrades.page.php' );
17	require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/display-items-functions.php' );
18	require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/product-functions.php' );
	@@ -43,10 +41,13 @@ if ( !get_option( 'wpsc_checkout_form_sets' ) ) {
43	* @return $vars (array) - modified query arguments
44	*/
45	function wpsc_query_vars_product_list($vars){
46	-
47	if(is_admin() && isset($vars['post_type']) && 'wpsc-product' == $vars['post_type'] && isset($vars['orderby'])){
48	$vars['orderby'] = 'date';
49	$vars['order'] = 'desc';



50	}
51	if( 'dragndrop' == get_option('wpsc_sort_by') ){
52	$vars['orderby'] = 'menu_order title';
	@@ -55,10 +56,48 @@ function wpsc_query_vars_product_list($vars){
55	}
56	return $vars;
57	}































58	function wpsc_drag_and_drop_ordering($per_page, $post_type){
59	- global $wpdb;
60	- if('wpsc-product' == $post_type ~~&& 'dragndrop' == get_option('wpsc_sort_by'~~) ){
61	- ~~$per_page~~ = ~~$wpdb->get_var("SELECT~~ ~~COUNT~~(*) FROM {$wpdb->posts} WHERE `post_type`='~~wpsc-product~~' ~~AND `post_parent`=0"~~);







62	return $per_page;
63	}else{
64	return $per_page;
	@@ -131,19 +170,18 @@ function wpsc_admin_pages() {
131
132	// Debug Page
133	if ( ( defined( 'WPSC_ADD_DEBUG_PAGE' ) && ( WPSC_ADD_DEBUG_PAGE == true ) ) \|\| ( isset( $_SESSION['wpsc_activate_debug_page'] ) && ( true == $_SESSION['wpsc_activate_debug_page'] ) ) )
134	- $page_hooks[] = add_options_page( __( 'Store Debug' ), __( 'Store Debug' ), 'administrator', 'wpsc-debug', 'wpsc_debug_page' );
135
136	// Contextual help
137	if ( function_exists( 'add_contextual_help' ) ) {
138	$header = '<p><strong>' . __( 'For More Information', 'wpsc' ) . '</strong></p>';
139
140	- add_contextual_help( 'toplevel_page_wpsc-sales-logs', $header . "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/sales/'>About the Sales Page</a>" );
141	- add_contextual_help( 'toplevel_page_wpsc-edit-products', $header . "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/products'>About the Products Page</a>" );
142	- add_contextual_help( 'products_page_wpsc-edit-groups', $header . "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/categories/'>About the Categories Page</a>" );
143	- add_contextual_help( 'products_page_edit-tags', $header . "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/variations/'>About the Variations Page</a>" );
144	- add_contextual_help( 'settings_page_wpsc-settings', $header . "<a target='_blank' href='http://getshopped.org/resources/docs/store-settings/general/'>General Settings</a><br />
145	- <a target='_blank' href='http://getshopped.org/resources/docs/store~~-settings~~/~~checkout/~~'>~~Checkout~~ Options</a~~> <~~br />" );
146	- add_contextual_help( 'products_page_wpsc-edit-coupons', $header . "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/marketing'>Marketing Options</a><br />" );
147	}
148
149	$page_hooks = apply_filters( 'wpsc_additional_pages', $page_hooks, $products_page );
	@@ -256,10 +294,10 @@ function wpsc_meta_boxes() {
256	remove_meta_box( 'wpsc-variationdiv', 'wpsc-product', 'core' );
257
258	//if a variation page do not show these metaboxes
259	- if (is_object($post) && $post->post_parent == 0 ) {
260	add_meta_box( 'wpsc_product_variation_forms', __('Variations', 'wpsc'), 'wpsc_product_variation_forms', $pagename, 'normal', 'high' );
261	add_meta_box( 'wpsc_product_external_link_forms', __('Off Site Product link', 'wpsc'), 'wpsc_product_external_link_forms', $pagename, 'normal', 'high' );
262	- }else {
263	remove_meta_box( 'tagsdiv-product_tag', 'wpsc-product', 'core' );
264	remove_meta_box( 'wpsc_product_external_link_forms', 'wpsc-product', 'core' );
265	remove_meta_box( 'wpsc_product_categorydiv', 'wpsc-product', 'core' );
	@@ -289,6 +327,19 @@ function wpsc_admin_include_css_and_js_refac( $pagehook ) {
289	$siteurl = str_replace( "http://", "https://", $siteurl );
290
291	wp_admin_css( 'dashboard' );













292
293	$version_identifier = WPSC_VERSION . "." . WPSC_MINOR_VERSION;
294	$pages = array( 'index.php', 'options-general.php', 'edit.php', 'post.php', 'post-new.php' );
	@@ -331,10 +382,10 @@ function wpsc_admin_dynamic_js() {
331
332	$form_types = '';
333	foreach ( (array)$form_types1 as $form_type ) {
334	- $form_types .= "<option value='" . $form_type . "'>" . ~~__(~~ $form_type, ~~'wpsc' )~~ . "</option>";
335	}
336
337	- $unique_names = "<option value='-1'>Select a Unique Name</option>";
338	foreach ( (array)$unique_names1 as $unique_name ) {
339	$unique_names.= "<option value='" . $unique_name . "'>" . $unique_name . "</option>";
340	}
	@@ -447,13 +498,13 @@ function wpsc_admin_latest_activity() {
447	//calculates amount of money made for the month
448	$currentMonthsSales = wpsc_currency_display( admin_display_total_price( $start_timestamp, $end_timestamp ) );
449	echo $currentMonthsSales;
450	- echo "<span class='dashboardWidget'>" . __( 'Sales', 'wpsc' ) . "</span>";
451	echo "</p>";
452	echo "<p class='dashboardWidgetSpecial'>";
453	echo "<span class='pricedisplay'>";
454	echo $currentMonthOrders;
455	echo "</span>";
456	- echo "<span class='dashboardWidget'>" . __( 'Orders', 'wpsc' ) . "</span>";
457	echo "</p>";
458	echo "<p class='dashboardWidgetSpecial'>";
459	//calculates average sales amount per order for the month
	@@ -462,7 +513,7 @@ function wpsc_admin_latest_activity() {
462	echo wpsc_currency_display( $monthsAverage );
463	}
464	//echo "</span>";
465	- echo "<span class='dashboardWidget'>" . __( 'Avg ~~Orders~~', 'wpsc' ) . "</span>";
466	echo "</p>";
467	echo "</div>";
468	/*
	@@ -474,13 +525,13 @@ function wpsc_admin_latest_activity() {
474
475	echo "<p class='dashboardWidgetSpecial'>";
476	echo wpsc_currency_display( admin_display_total_price() );
477	- echo "<span class='dashboardWidget'>" . __( 'Sales', 'wpsc' ) . "</span>";
478	echo "</p>";
479	echo "<p class='dashboardWidgetSpecial'>";
480	echo "<span class='pricedisplay'>";
481	echo $totalOrders;
482	echo "</span>";
483	- echo "<span class='dashboardWidget'>" . __( 'Orders', 'wpsc' ) . "</span>";
484	echo "</p>";
485	echo "<p class='dashboardWidgetSpecial'>";
486	//calculates average sales amount per order for the month
	@@ -491,7 +542,7 @@ function wpsc_admin_latest_activity() {
491	}
492	echo wpsc_currency_display( $totalAverage );
493	//echo "</span>";
494	- echo "<span class='dashboardWidget'>" . __( 'Avg ~~Orders~~', 'wpsc' ) . "</span>";
495	echo "</p>";
496	echo "</div>";
497	echo "<div style='clear:both'></div>";
	@@ -730,28 +781,30 @@ function wpsc_dashboard_4months_widget() {
730	}
731
732	$tablerow = 1;
733	- ~~$output = ''~~;
734	- ~~$output.='<div style="padding-bottom:15px; ">Last four months of sales on a per product basis:</div>~~

735	<table style="width:100%" border="0" cellspacing="0">
736	<tr style="font-style:italic; color:#666;" height="20">
737	- <td colspan="2" style=" font-family:\'Times New Roman\', Times, serif; font-size:15px; border-bottom:solid 1px #000;">At a Glance</td>';
738	- foreach ( $months as $mnth ) {
739	- ~~$output.='~~<td align="center" style=" font-family:\'Times New Roman\'; font-size:15px; border-bottom:solid 1px #000;">' . date( "M", $mnth ) ~~. '</~~td>';
740	- }
741	- ~~$output.='~~</tr>';
742	- foreach ( (array)$prod_data as $sales_data ) {
743	- ~~$output.='~~<tr height="20">
744	- <td width="20" style="font-weight:bold; color:#008080; border-bottom:solid 1px #000;">' . $tablerow ~~. '</~~td>
745	- <td style="border-bottom:solid 1px #000;width:60px">' . $sales_data['product_name'] ~~. '</~~td>';
746	- $~~currsymbol~~ = ~~wpsc_get_currency_symbol(~~);




747	$tablerow++;
748	- ~~foreach~~ ~~( $sales_data['sale_totals'] as $amount ) {~~
749	- ~~$output.= '<td align="center" style="border-bottom:solid 1px #000;">' . $currsymbol . number_format( absint( $amount ), 2 ) . '~~</td>';
750	- }
751	- ~~$output.='</tr>'~~;
752	- }
753	- $output.='</table>';
754	- echo $output;
755	}
756
757
	@@ -813,17 +866,22 @@ function wpsc_ajax_ie_save() {
813	'post_title' => $_POST['title']
814	);
815
816	- $id = wp_update_post( $product );
817	if ( $id > 0 ) {



818	$product_meta = get_product_meta( $product['ID'], 'product_metadata', true );
819	- if ( is_numeric( $_POST['weight'] ) \|\| empty( $_POST['weight'] ) )
820	- $product_meta['weight'] = $_POST['weight'];


821
822	update_product_meta( $product['ID'], 'product_metadata', $product_meta );
823	update_product_meta( $product['ID'], 'price', (float)$_POST['price'] );
824	update_product_meta( $product['ID'], 'special_price', (float)$_POST['special_price'] );
825	update_product_meta( $product['ID'], 'sku', $_POST['sku'] );
826	- if ( $_POST['stock'] ~~=== ''~~ )
827	update_product_meta( $product['ID'], 'stock', '' );
828	else
829	update_product_meta( $product['ID'], 'stock', absint( $_POST['stock'] ) );
	@@ -833,10 +891,10 @@ function wpsc_ajax_ie_save() {
833	$price = get_product_meta( $id, 'price', true );
834	$special_price = get_product_meta( $id, 'special_price', true );
835	$sku = get_product_meta( $id, 'sku', true );
836	- $sku = ( $sku )?$sku:'N/A';
837	$stock = get_product_meta( $id, 'stock', true );
838	- $stock = ( $stock === '' )?'N/A':$stock;
839	- $results = array( 'id' => $id, 'title' => $post->post_title, 'weight' => ~~absint~~( $meta['weight'] ), 'price' => wpsc_currency_display( $price ), 'special_price' => wpsc_currency_display( $special_price ), 'sku' => $sku, 'stock' => $stock );
840	echo '(' . json_encode( $results ) . ')';
841	die();
842	} else {
	@@ -845,10 +903,14 @@ function wpsc_ajax_ie_save() {
845	die();
846	}
847





848	add_action( 'permalink_structure_changed' , 'wpsc_update_permalinks' );
849	add_action( 'get_sample_permalink_html' , 'wpsc_update_permalinks' );
850	add_action( 'wp_ajax_category_sort_order', 'wpsc_ajax_set_category_order' );
851	add_action( 'wp_ajax_wpsc_ie_save', 'wpsc_ajax_ie_save' );
852	-
853	-
854	?>


11	// admin includes
12	require_once( WPSC_FILE_PATH . '/wpsc-admin/display-update.page.php' );
13	require_once( WPSC_FILE_PATH . '/wpsc-admin/display-items.page.php' );


14	require_once( WPSC_FILE_PATH . '/wpsc-admin/display-upgrades.page.php' );
15	require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/display-items-functions.php' );
16	require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/product-functions.php' );

41	* @return $vars (array) - modified query arguments
42	*/
43	function wpsc_query_vars_product_list($vars){
44	+ $vars['posts_per_archive_page'] = 0;
45	if(is_admin() && isset($vars['post_type']) && 'wpsc-product' == $vars['post_type'] && isset($vars['orderby'])){
46	$vars['orderby'] = 'date';
47	$vars['order'] = 'desc';
48	+ $vars['nopaging'] = false;
49	+ $posts_per_page = (int)get_user_option( 'edit_wpsc_product_per_page' );
50	+ $vars['posts_per_page'] = ( $posts_per_page )?$posts_per_page:20;
51	}
52	if( 'dragndrop' == get_option('wpsc_sort_by') ){
53	$vars['orderby'] = 'menu_order title';

56	}
57	return $vars;
58	}
59	+
60	+ /**
61	+ * setting the screen option to between 1 and 999
62	+ * @access public
63	+ *
64	+ * @since 3.8
65	+ * @param $status
66	+ * @param $option (string) name of option being saved
67	+ * @param $value (string) value of option being saved
68	+ * @return $value after changes...
69	+ */
70	+ function wpsc_set_screen_option($status, $option, $value){
71	+ if ($option == "edit_wpsc_product_per_page"){
72	+ $value = (int) $value;
73	+ if ( $value < 1 \|\| $value > 999 )
74	+ return FALSE;
75	+ return $value;
76	+ }
77	+ return $value;
78	+ }
79	+ add_filter('set-screen-option', 'wpsc_set_screen_option', 99, 3);
80	+
81	+ /**
82	+ * When rearranging the products for drag and drop it is easiest to arrange them when they are all on the same page...
83	+ * @access public (wp-admin)
84	+ *
85	+ * @since 3.8
86	+ * @param $per_page (int) number of products per page
87	+ * @param $post_type (string) name of current post type
88	+ * @return $per_page after changes...
89	+ */
90	function wpsc_drag_and_drop_ordering($per_page, $post_type){
91	+ global $wpdb;
92	+ if('wpsc-product' == $post_type ){
93	+ if( 'dragndrop' == get_option('wpsc_sort_by')){
94	+ $per_page = $wpdb->get_var("SELECT COUNT(*) FROM {$wpdb->posts} WHERE `post_type`='wpsc-product' AND `post_parent`=0");
95	+ }else{
96	+ $_post_type = str_replace('-', '_', $post_type);
97	+ $edit_per_page = 'edit_' . $_post_type . '_per_page';
98	+ $per_page = ((int) get_user_option( $edit_per_page ))?(int) get_user_option( $edit_per_page ):$per_page;
99	+ }
100	+
101	return $per_page;
102	}else{
103	return $per_page;

170
171	// Debug Page
172	if ( ( defined( 'WPSC_ADD_DEBUG_PAGE' ) && ( WPSC_ADD_DEBUG_PAGE == true ) ) \|\| ( isset( $_SESSION['wpsc_activate_debug_page'] ) && ( true == $_SESSION['wpsc_activate_debug_page'] ) ) )
173	+ $page_hooks[] = add_options_page( __( 'Store Debug', 'wpsc' ), __( 'Store Debug', 'wpsc' ), 'administrator', 'wpsc-debug', 'wpsc_debug_page' );
174
175	// Contextual help
176	if ( function_exists( 'add_contextual_help' ) ) {
177	$header = '<p><strong>' . __( 'For More Information', 'wpsc' ) . '</strong></p>';
178
179	+ add_contextual_help( 'toplevel_page_wpsc-sales-logs', $header . __( "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/sales/'>About the Sales Page</a>", 'wpsc' ) );
180	+ add_contextual_help( 'toplevel_page_wpsc-edit-products', $header . __( "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/products'>About the Products Page</a>", 'wpsc' ) );
181	+ add_contextual_help( 'products_page_wpsc-edit-groups', $header . __( "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/categories/'>About the Categories Page</a>", 'wpsc' ) );
182	+ add_contextual_help( 'products_page_edit-tags', $header . __( "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/variations/'>About the Variations Page</a>", 'wpsc' ) );
183	+ add_contextual_help( 'settings_page_wpsc-settings', $header . __( "<a target='_blank' href='http://getshopped.org/resources/docs/store-settings/general/'>General Settings</a><br /> <a target='_blank' href='http://getshopped.org/resources/docs/store-settings/checkout/'>Checkout Options</a> <br />", 'wpsc' ) );
184	+ add_contextual_help( 'products_page_wpsc-edit-coupons', $header . __( "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-store/marketing'>Marketing Options</a><br />", 'wpsc' ) );

185	}
186
187	$page_hooks = apply_filters( 'wpsc_additional_pages', $page_hooks, $products_page );

294	remove_meta_box( 'wpsc-variationdiv', 'wpsc-product', 'core' );
295
296	//if a variation page do not show these metaboxes
297	+ if ( is_object( $post ) && $post->post_parent == 0 ) {
298	add_meta_box( 'wpsc_product_variation_forms', __('Variations', 'wpsc'), 'wpsc_product_variation_forms', $pagename, 'normal', 'high' );
299	add_meta_box( 'wpsc_product_external_link_forms', __('Off Site Product link', 'wpsc'), 'wpsc_product_external_link_forms', $pagename, 'normal', 'high' );
300	+ } else if( is_object( $post ) && $post->post_status == "inherit" ) {
301	remove_meta_box( 'tagsdiv-product_tag', 'wpsc-product', 'core' );
302	remove_meta_box( 'wpsc_product_external_link_forms', 'wpsc-product', 'core' );
303	remove_meta_box( 'wpsc_product_categorydiv', 'wpsc-product', 'core' );

327	$siteurl = str_replace( "http://", "https://", $siteurl );
328
329	wp_admin_css( 'dashboard' );
330	+
331	+ if($current_screen->id == 'dashboard_page_wpsc-sales-logs'){
332	+ // jQuery
333	+ wp_enqueue_script( 'jquery' );
334	+ wp_enqueue_script( 'jquery-ui-draggable' );
335	+ wp_enqueue_script( 'jquery-ui-droppable' );
336	+ wp_enqueue_script( 'jquery-ui-sortable' );
337	+
338	+ // Metaboxes
339	+ wp_enqueue_script( 'common' );
340	+ wp_enqueue_script( 'wp-lists' );
341	+ wp_enqueue_script( 'postbox' );
342	+ }
343
344	$version_identifier = WPSC_VERSION . "." . WPSC_MINOR_VERSION;
345	$pages = array( 'index.php', 'options-general.php', 'edit.php', 'post.php', 'post-new.php' );

382
383	$form_types = '';
384	foreach ( (array)$form_types1 as $form_type ) {
385	+ $form_types .= "<option value='" . $form_type . "'>" . $form_type . "</option>";
386	}
387
388	+ $unique_names = "<option value='-1'>" . __('Select a Unique Name', 'wpsc') . "</option>";
389	foreach ( (array)$unique_names1 as $unique_name ) {
390	$unique_names.= "<option value='" . $unique_name . "'>" . $unique_name . "</option>";
391	}

498	//calculates amount of money made for the month
499	$currentMonthsSales = wpsc_currency_display( admin_display_total_price( $start_timestamp, $end_timestamp ) );
500	echo $currentMonthsSales;
501	+ echo "<span class='dashboardWidget'>" . _x( 'Sales', 'the total value of sales in dashboard widget', 'wpsc' ) . "</span>";
502	echo "</p>";
503	echo "<p class='dashboardWidgetSpecial'>";
504	echo "<span class='pricedisplay'>";
505	echo $currentMonthOrders;
506	echo "</span>";
507	+ echo "<span class='dashboardWidget'>" . _n( 'Order', 'Orders', $currentMonthOrders, 'wpsc' ) . "</span>";
508	echo "</p>";
509	echo "<p class='dashboardWidgetSpecial'>";
510	//calculates average sales amount per order for the month

513	echo wpsc_currency_display( $monthsAverage );
514	}
515	//echo "</span>";
516	+ echo "<span class='dashboardWidget'>" . __( 'Avg Order', 'wpsc' ) . "</span>";
517	echo "</p>";
518	echo "</div>";
519	/*

525
526	echo "<p class='dashboardWidgetSpecial'>";
527	echo wpsc_currency_display( admin_display_total_price() );
528	+ echo "<span class='dashboardWidget'>" . _x( 'Sales', 'the total value of sales in dashboard widget', 'wpsc' ) . "</span>";
529	echo "</p>";
530	echo "<p class='dashboardWidgetSpecial'>";
531	echo "<span class='pricedisplay'>";
532	echo $totalOrders;
533	echo "</span>";
534	+ echo "<span class='dashboardWidget'>" . _n( 'Order', 'Orders', $totalOrders, 'wpsc' ) . "</span>";
535	echo "</p>";
536	echo "<p class='dashboardWidgetSpecial'>";
537	//calculates average sales amount per order for the month

542	}
543	echo wpsc_currency_display( $totalAverage );
544	//echo "</span>";
545	+ echo "<span class='dashboardWidget'>" . __( 'Avg Order', 'wpsc' ) . "</span>";
546	echo "</p>";
547	echo "</div>";
548	echo "<div style='clear:both'></div>";

781	}
782
783	$tablerow = 1;
784	+ ob_start();
785	+ ?>
786	+ <div style="padding-bottom:15px; "><?php _e('Last four months of sales on a per product basis:', 'wpsc'); ?></div>
787	<table style="width:100%" border="0" cellspacing="0">
788	<tr style="font-style:italic; color:#666;" height="20">
789	+ <td colspan="2" style=" font-family:\'Times New Roman\', Times, serif; font-size:15px; border-bottom:solid 1px #000;"><?php _e('At a Glance', 'wpsc'); ?></td>
790	+ <?php foreach ( $months as $mnth ): ?>
791	+ <td align="center" style=" font-family:\'Times New Roman\'; font-size:15px; border-bottom:solid 1px #000;"><?php echo date( "M", $mnth ); ?></td>
792	+ <?php endforeach; ?>
793	+ </tr>
794	+ <?php foreach ( (array)$prod_data as $sales_data ): ?>
795	+ <tr height="20">
796	+ <td width="20" style="font-weight:bold; color:#008080; border-bottom:solid 1px #000;"><?php echo $tablerow; ?></td>
797	+ <td style="border-bottom:solid 1px #000;width:60px"><?php echo $sales_data['product_name']; ?></td>
798	+ <?php foreach ( $sales_data['sale_totals'] as $amount ): ?>
799	+ <td align="center" style="border-bottom:solid 1px #000;"><?php echo wpsc_currency_display($amount); ?></td>
800	+ <?php endforeach; ?>
801	+ </tr>
802	+ <?php
803	$tablerow++;
804	+ endforeach; ?>
805	+ </table>
806	+ <?php
807	+ ob_end_flush();



808	}
809
810

866	'post_title' => $_POST['title']
867	);
868
869	+ $id = wp_update_post( $product );
870	if ( $id > 0 ) {
871	+ //need parent meta to know which weight unit we are using
872	+ $post = get_post( $id );
873	+ $parent_meta = get_product_meta($post->post_parent, 'product_metadata', true );
874	$product_meta = get_product_meta( $product['ID'], 'product_metadata', true );
875	+ if ( is_numeric( $_POST['weight'] ) \|\| empty( $_POST['weight'] ) ){
876	+ $product_meta['weight'] = wpsc_convert_weight($_POST['weight'], $parent_meta['weight_unit'], 'pound', true);
877	+ $product_meta['weight_unit'] = $parent_meta['weight_unit'];
878	+ }
879
880	update_product_meta( $product['ID'], 'product_metadata', $product_meta );
881	update_product_meta( $product['ID'], 'price', (float)$_POST['price'] );
882	update_product_meta( $product['ID'], 'special_price', (float)$_POST['special_price'] );
883	update_product_meta( $product['ID'], 'sku', $_POST['sku'] );
884	+ if ( !is_numeric($_POST['stock']) )
885	update_product_meta( $product['ID'], 'stock', '' );
886	else
887	update_product_meta( $product['ID'], 'stock', absint( $_POST['stock'] ) );

891	$price = get_product_meta( $id, 'price', true );
892	$special_price = get_product_meta( $id, 'special_price', true );
893	$sku = get_product_meta( $id, 'sku', true );
894	+ $sku = ( $sku )?$sku:__('N/A', 'wpsc');
895	$stock = get_product_meta( $id, 'stock', true );
896	+ $stock = ( $stock === '' )?__('N/A', 'wpsc'):$stock;
897	+ $results = array( 'id' => $id, 'title' => $post->post_title, 'weight' => wpsc_convert_weight($meta['weight'], 'pound', $parent_meta['weight_unit']), 'price' => wpsc_currency_display( $price ), 'special_price' => wpsc_currency_display( $special_price ), 'sku' => $sku, 'stock' => $stock );
898	echo '(' . json_encode( $results ) . ')';
899	die();
900	} else {

903	die();
904	}
905
906	+ function wpsc_add_meta_boxes(){
907	+ global $wp_current_screen_options;
908	+ add_meta_box( 'dashboard_right_now', __('Current Month', 'wpsc'), 'wpsc_right_now', 'dashboard_page_wpsc-sales-logs', 'top' );
909	+ }
910	+
911	add_action( 'permalink_structure_changed' , 'wpsc_update_permalinks' );
912	add_action( 'get_sample_permalink_html' , 'wpsc_update_permalinks' );
913	add_action( 'wp_ajax_category_sort_order', 'wpsc_ajax_set_category_order' );
914	add_action( 'wp_ajax_wpsc_ie_save', 'wpsc_ajax_ie_save' );
915	+ add_action('in_admin_header', 'wpsc_add_meta_boxes');

916	?>

wpsc-admin/ajax-and-init.php CHANGED Viewed

	@@ -69,7 +69,6 @@ if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action']
69	}
70
71	function wpsc_ajax_sales_quarterly() {
72	- global $wpdb;
73	$lastdate = $_POST['add_start'];
74	$date = preg_split( '/-/', $lastdate );
75	if ( !isset( $date[0] ) )
	@@ -129,151 +128,10 @@ if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action']
129	add_action( 'admin_init', 'wpsc_delete_file' );
130	}
131
132	- function wpsc_modify_product_price() {
133	- global $wpdb;
134	- $product_data = array_pop( $_POST['product_price'] );
135	-
136	- $product_id = absint( $product_data['id'] );
137	- $product_price = $product_data['price'];
138	- $product_nonce = $product_data['nonce'];
139	-
140	- if ( wp_verify_nonce( $product_nonce, 'edit-product_price-' . $product_id ) ) {
141	- $product_price = (float)str_replace( ',','',$product_price );
142	- if ( update_post_meta( $product_id, '_wpsc_price', $product_price ) ) {
143	- echo "success = 1;\n\r";
144	- echo "new_price = '" . wpsc_currency_display( $product_price,array( 'display_as_html' => false ) ) . "';\n\r";
145	- } else {
146	- echo "success = 0;\n\r";
147	- }
148	- } else {
149	- echo "success = -1;\n\r";
150	- }
151	- exit();
152	- }
153	-
154	- if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action'] == 'modify_price') ) {
155	- add_action( 'admin_init', 'wpsc_modify_product_price' );
156	- }
157	-
158	- function wpsc_modify_sales_product_price() {
159	- global $wpdb;
160	- $product_data = array_pop( $_POST['sale_product_price'] );
161	-
162	- $product_id = absint( $product_data['id'] );
163	- $product_price = $product_data['price'];
164	- $product_nonce = $product_data['nonce'];
165	-
166	- if ( wp_verify_nonce( $product_nonce, 'sale-edit-product_price-' . $product_id ) ) {
167	- $product_price = (float)str_replace( ',','',$product_price );
168	- if ( update_post_meta( $product_id, '_wpsc_special_price', $product_price ) ) {
169	- echo "success = 1;\n\r";
170	- echo "new_price = '" . wpsc_currency_display( $product_price,array( 'display_as_html' => false ) ) . "';\n\r";
171	- } else {
172	- echo "success = 0;\n\r";
173	- }
174	- } else {
175	- echo "success = -1;\n\r";
176	- }
177	- exit();
178	- }
179	-
180	- if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action'] == 'modify_sales_price') ) {
181	- add_action( 'admin_init', 'wpsc_modify_sales_product_price' );
182	- }
183	-
184	- function wpsc_modify_sku() {
185	- global $wpdb;
186	- $product_data = array_pop( $_POST['sku_field'] );
187	-
188	- $product_id = absint( $product_data['id'] );
189	- $sku = $product_data['sku'];
190	- $product_nonce = $product_data['nonce'];
191	-
192	- if ( wp_verify_nonce( $product_nonce, 'edit-sku-' . $product_id ) ) {
193	- if ( update_post_meta( $product_id, '_wpsc_sku', $sku ) ) {
194	- echo "success = 1;\n\r";
195	- echo "new_price = '" . $sku . "';\n\r";
196	- } else {
197	- echo "success = 0;\n\r";
198	- }
199	- } else {
200	- echo "success = -1;\n\r";
201	- }
202	- exit();
203	- }
204	-
205	- if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action'] == 'modify_sku') ) {
206	- add_action( 'admin_init', 'wpsc_modify_sku' );
207	- }
208	-
209	- function wpsc_modify_weight() {
210	- global $wpdb;
211	-
212	- $product_data = array_pop( $_POST['weight_field'] );
213	-
214	- $product_id = absint( $product_data['id'] );
215	- $product_nonce = $product_data['nonce'];
216	-
217	- if ( wp_verify_nonce( $product_nonce, 'edit-weight-' . $product_id ) ) {
218	-
219	- $old_array = get_product_meta( $product_id, 'product_metadata' );
220	- $old_array = array_pop( $old_array );
221	-
222	- $weight = wpsc_convert_weight( $product_data['weight'], $old_array["weight_unit"], "pound" );
223	-
224	- foreach ( $old_array as $key => $value ) {
225	- if ( $key == 'weight' ) {
226	- $old_array[$key] = $weight;
227	- }
228	- }
229	-
230	- if ( update_product_meta( $product_id, 'product_metadata', $old_array ) ) {
231	- echo "success = 1;\n\r";
232	- echo "new_price = '" . wpsc_convert_weight( $weight, "pound", $old_array["weight_unit"] ) . "';\n\r";
233	- } else {
234	- echo "success = 0;\n\r";
235	- }
236	- } else {
237	- echo "success = -1;\n\r";
238	- }
239	- exit();
240	- }
241	-
242	- if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action'] == 'modify_weight') ) {
243	- add_action( 'admin_init', 'wpsc_modify_weight' );
244	- }
245	-
246	- function wpsc_modify_stock() {
247	- global $wpdb;
248	- $product_data = array_pop( $_POST['stock_field'] );
249	-
250	- $product_id = absint( $product_data['id'] );
251	- $stock = (int)$product_data['stock'];
252	- $product_nonce = $product_data['nonce'];
253	-
254	- if ( wp_verify_nonce( $product_nonce, 'edit-stock-' . $product_id ) ) {
255	- if ( update_post_meta( $product_id, '_wpsc_stock', $stock ) ) {
256	- echo "success = 1;\n\r";
257	- echo "new_price = '" . $stock . "';\n\r";
258	- } else {
259	- echo "success = 0;\n\r";
260	- }
261	- } else {
262	- echo "success = -1;\n\r";
263	- }
264	- exit();
265	- }
266	-
267	- if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action'] == 'modify_stock') ) {
268	- add_action( 'admin_init', 'wpsc_modify_stock' );
269	- }
270	-
271	/**
272	Function and action for publishing or unpublishing single products
273	*/
274	function wpsc_ajax_toggle_published() {
275	- global $wpdb;
276	-
277	$product_id = absint( $_GET['product'] );
278	check_admin_referer( 'toggle_publish_' . $product_id );
279
	@@ -293,8 +151,6 @@ if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action']
293	* Purposely not duplicating stick post status (logically, products are most often duplicated because they share many attributes, where products are generally 'featured' uniquely.)
294	*/
295	function wpsc_duplicate_product() {
296	- global $wpdb;
297	-
298	// Get the original post
299	$id = absint( $_GET['product'] );
300	$post = wpsc_duplicate_this_dangit( $id );
	@@ -320,7 +176,7 @@ function wpsc_duplicate_this_dangit( $id ) {
320	}
321
322	function wpsc_duplicate_product_process( $post ) {
323	- global $~~wpdb, $~~current_user;
324	wp_get_current_user();
325	$user_ID = $current_user->ID;
326
	@@ -353,7 +209,6 @@ function wpsc_duplicate_product_process( $post ) {
353	);
354	// Insert the new template in the post table
355	$new_post_id = wp_insert_post($defaults);
356	- //$new_post_id = $wpdb->insert_id;
357
358	// Copy the taxonomies
359	wpsc_duplicate_taxonomies( $post->ID, $new_post_id, $post->post_type );
	@@ -371,15 +226,11 @@ function wpsc_duplicate_product_process( $post ) {
371	* Copy the taxonomies of a post to another post
372	*/
373	function wpsc_duplicate_taxonomies( $id, $new_id, $post_type ) {
374	- ~~global~~ $~~wpdb~~;
375	- if ( ~~isset(~~ $~~wpdb->terms~~ ) ) {
376	- // ~~WordPress~~ ~~2.3~~
377	- $~~taxonomies~~ = ~~get_object_taxonomies~~( $~~post_type~~ ); ~~//array("category",~~ ~~"post_tag"~~);
378	- ~~foreach~~ ( $~~taxonomies~~ as $taxonomy ) {
379	- $post_terms = wp_get_object_terms( $id, $taxonomy );
380	- for ( $i = 0; $i < count( $post_terms ); $i++ ) {
381	- wp_set_object_terms( $new_id, $post_terms[$i]->slug, $taxonomy, true );
382	- }
383	}
384	}
385	}
	@@ -452,7 +303,7 @@ if ( isset( $_GET['wpsc_admin_action'] ) && ($_GET['wpsc_admin_action'] == 'dupl
452	}
453
454	function wpsc_purchase_log_csv() {
455	- global $wpdb, $~~user_level, $wp_rewrite, $wpsc_purchlog_statuses, $~~wpsc_gateways;
456	get_currentuserinfo();
457	$count = 0;
458	if ( ($_GET['rss_key'] == 'key') && is_numeric( $_GET['start_timestamp'] ) && is_numeric( $_GET['end_timestamp'] ) && (current_user_can('edit_post')) ) {
	@@ -473,9 +324,6 @@ function wpsc_purchase_log_csv() {
473
474	foreach ( (array)$data as $purchase ) {
475	$form_headers = '';
476	- $country_sql = "SELECT * FROM `" . WPSC_TABLE_SUBMITED_FORM_DATA . "` WHERE `log_id` = '" . $purchase['id'] . "' AND `form_id` = '" . get_option( 'country_form_field' ) . "' LIMIT 1";
477	- $country_data = $wpdb->get_results( $country_sql, ARRAY_A );
478	- $country = $country_data[0]['value'];
479	$output .= "\"" . $purchase['id'] . "\","; //Purchase ID
480	$output .= "\"" . $purchase['totalprice'] . "\","; //Purchase Total
481	foreach ( (array)$form_data as $form_field ) {
	@@ -502,7 +350,7 @@ function wpsc_purchase_log_csv() {
502	// Go through all products in cart and display quantity and sku
503	foreach ( (array)$cart as $item ) {
504	$skuvalue = get_product_meta($item['prodid'], 'sku', true);
505	- if(empty($skuvalue)) $skuvalue = 'N/A';
506	$output .= "\"" . $item['quantity'] . " x " . str_replace( '"', '\"', $item['name'] ) . "\"";
507	$output .= "," . $skuvalue."," ;
508	}
	@@ -526,8 +374,7 @@ if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action']
526	}
527
528	function wpsc_admin_ajax() {
529	- global $wpdb~~, $user_level, $wp_rewrite~~;
530	- get_currentuserinfo();
531
532	if ( $_POST['action'] == 'product-page-order' ) {
533	$current_order = get_option( 'wpsc_product_page_order' );
	@@ -620,12 +467,6 @@ function wpsc_admin_ajax() {
620	exit();
621	}
622	}
623	-
624	- if ( isset( $_POST['language_setting'] ) && ($_GET['page'] = WPSC_DIR_NAME . '/wpsc-admin/display-options.page.php') ) {
625	- if ( $user_level >= 7 ) {
626	- update_option( 'language_setting', $_POST['language_setting'] );
627	- }
628	- }
629	}
630
631	function wpsc_admin_sale_rss() {
	@@ -661,47 +502,6 @@ function wpsc_admin_sale_rss() {
661	}
662	}
663
664	- function wpsc_swfupload_images() {
665	- global $wpdb, $current_user, $user_ID;
666	- $file = $_FILES['async-upload'];
667	- $product_id = absint( $_POST['product_id'] );
668	- $nonce = $_POST['_wpnonce'];
669	- $output = '';
670	- // Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead, code is from wp-admin/async-upload.php
671	- if ( is_ssl() && empty( $_COOKIE[SECURE_AUTH_COOKIE] ) && !empty( $_REQUEST['auth_cookie'] ) ) {
672	- $_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
673	- } else if ( empty( $_COOKIE[AUTH_COOKIE] ) && !empty( $_REQUEST['auth_cookie'] ) ) {
674	- $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
675	- }
676	- unset( $current_user );
677	-
678	- if ( !current_user_can( 'upload_files' ) ) {
679	- exit( "status=-1;\n" );
680	- }
681	-
682	- if ( !wp_verify_nonce( $nonce, 'product-swfupload' ) ) {
683	- exit( "status=-1;\n" );
684	- }
685	-
686	-
687	-
688	- $id = media_handle_upload( 'async-upload', $product_id );
689	-
690	- if ( !is_wp_error( $id ) ) {
691	- $src = wp_get_attachment_image_src( $id );
692	- $output .= "upload_status=1;\n";
693	- $output .= "image_src='" . $src[0] . "';\n";
694	- $output .= "image_id='$id';\n";
695	- $output .= "product_id='$product_id';\n";
696	- $output .= "replace_existing=0;";
697	- } else {
698	- $output .= "status=0;\n";
699	- }
700	-
701	-
702	- exit( $output );
703	- }
704	-
705	function wpsc_display_invoice() {
706
707	global $body_id;
	@@ -830,26 +630,25 @@ if ( isset( $_REQUEST['wpsc_admin_action2'] ) && ($_REQUEST['wpsc_admin_action2'
830	//edit purchase log status function
831	function wpsc_purchlog_edit_status( $purchlog_id='', $purchlog_status='' ) {
832	global $wpdb;
833	- if ( ($purchlog_id ~~== ''~~) && ($purchlog_status ~~== ''~~) ) {
834	$purchlog_id = absint( $_POST['purchlog_id'] );
835	$purchlog_status = absint( $_POST['purchlog_status'] );
836	}
837
838	$log_data = $wpdb->get_row( "SELECT * FROM `" . WPSC_TABLE_PURCHASE_LOGS . "` WHERE `id` = '{$purchlog_id}' LIMIT 1", ARRAY_A );
839	- if ( ($~~purchlog_id == 2) && function_exists(~~ '~~wpsc_member_activate_subscriptions~~' ) ~~) {~~

840	wpsc_member_activate_subscriptions( $_POST['id'] );
841	}
842
843	//in the future when everyone is using the 2.0 merchant api, we should use the merchant class to update the staus,
844	// then you can get rid of this hook and have each person overwrite the method that updates the status.
845	do_action('wpsc_edit_order_status', array('purchlog_id'=>$purchlog_id, 'purchlog_data'=>$log_data, 'new_status'=>$purchlog_status));
846	- // if the order is marked as failed, remove the claim on the stock
847	- if ( $purchlog_status == 5 )
848	- $wpdb->query( "DELETE FROM `" . WPSC_TABLE_CLAIMED_STOCK . "` WHERE `cart_id` = '{$purchlog_id}' AND `cart_submitted` = '1'" );
849	-
850
851	$wpdb->query( "UPDATE `" . WPSC_TABLE_PURCHASE_LOGS . "` SET processed='{$purchlog_status}' WHERE id='{$purchlog_id}'" );
852	-


853	if ( ($purchlog_id > $log_data['processed']) && ($log_data['processed'] <= 2) && $log_data['email_sent'] == 0 ) {
854	transaction_results($log_data['sessionid'],false,null);
855	}
	@@ -863,7 +662,7 @@ function wpsc_save_product_order() {
863	global $wpdb;
864
865	$products = array( );
866	- foreach ( $_POST['~~page~~'] as $product ) {
867	$products[] = absint( $product );
868	}
869
	@@ -960,7 +759,6 @@ if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action']
960	*/
961
962	function wpsc_ajax_get_shipping_form() {
963	- global $wpdb, $wpsc_shipping_modules;
964	$shippingname = $_REQUEST['shippingname'];
965	$_SESSION['previous_shipping_name'] = $shippingname;
966	$shipping_data = wpsc_get_shipping_form( $shippingname );
	@@ -973,7 +771,6 @@ function wpsc_ajax_get_shipping_form() {
973	}
974
975	function wpsc_ajax_get_payment_form() {
976	- global $wpdb, $nzshpcrt_gateways;
977	$paymentname = $_REQUEST['paymentname'];
978	$_SESSION['previous_payment_name'] = $paymentname;
979	$payment_data = wpsc_get_payment_form( $paymentname );
	@@ -1114,7 +911,7 @@ function wpsc_submit_options( $selected='' ) {
1114
1115	update_option( 'custom_shipping_options', $_POST['custom_shipping_options'] );
1116
1117	-
1118	foreach ( $GLOBALS['wpsc_shipping_modules'] as $shipping ) {
1119	foreach ( (array)$_POST['custom_shipping_options'] as $shippingoption ) {
1120	if ( $shipping->internal_name == $shippingoption ) {
	@@ -1219,7 +1016,6 @@ function wpsc_update_page_urls($auto = false) {
1219	}
1220
1221	update_option( $option_key, $the_new_link );
1222	- $updated;
1223	}
1224
1225	if(!$auto){
	@@ -1296,8 +1092,6 @@ if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action']
1296	add_action( 'admin_init', 'wpsc_change_region_tax' );
1297
1298	function wpsc_product_files_existing() {
1299	- global $wpdb;
1300	-
1301	//List all product_files, with checkboxes
1302
1303	$product_id = absint( $_GET["product_id"] );
	@@ -1349,7 +1143,7 @@ if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action']
1349	add_action( 'admin_init', 'wpsc_product_files_existing' );
1350
1351	function prod_upload() {
1352	- global $wpdb~~, $product_id~~;
1353	$product_id = absint( $_POST["product_id"] );
1354
1355	foreach ( $_POST["select_product_file"] as $selected_file ) {
	@@ -1402,7 +1196,6 @@ if ( isset( $_GET['wpsc_admin_action'] ) && ($_GET['wpsc_admin_action'] == 'prod
1402
1403	//change the gateway settings
1404	function wpsc_gateway_settings() {
1405	- global $wpdb;
1406	//To update options
1407	if ( isset( $_POST['wpsc_options'] ) ) {
1408	foreach ( $_POST['wpsc_options'] as $key => $value ) {
	@@ -1622,8 +1415,6 @@ if ( isset( $_REQUEST['wpsc_admin_action'] ) && ($_REQUEST['wpsc_admin_action']
1622
1623	//for ajax call of settings page tabs
1624	function wpsc_settings_page_ajax() {
1625	- global $wpdb;
1626	-
1627	$html = '';
1628	$modified_page_title = $_POST['page_title'];
1629	$page_title = str_replace( "tab-", "", $modified_page_title );
	@@ -1631,27 +1422,27 @@ function wpsc_settings_page_ajax() {
1631	check_admin_referer( $modified_page_title );
1632	switch ( $page_title ) {
1633	case 'checkout' :
1634	- require_once( 'includes/settings-pages/checkout.php' );
1635	wpsc_options_checkout();
1636	break;
1637
1638	case 'gateway' :
1639	- require_once( 'includes/settings-pages/gateway.php' );
1640	wpsc_options_gateway();
1641	break;
1642
1643	case 'shipping' :
1644	- require_once( 'includes/settings-pages/shipping.php' );
1645	wpsc_options_shipping();
1646	break;
1647
1648	case 'admin' :
1649	- require_once( 'includes/settings-pages/admin.php' );
1650	wpsc_options_admin();
1651	break;
1652
1653	case 'presentation' :
1654	- require_once( 'includes/settings-pages/presentation.php' );
1655	wpsc_options_presentation();
1656	break;
1657
	@@ -1660,18 +1451,18 @@ function wpsc_settings_page_ajax() {
1660	break;
1661
1662	case 'marketing' :
1663	- require_once( 'includes/settings-pages/marketing.php' );
1664	wpsc_options_marketing();
1665	break;
1666
1667	case 'import' :
1668	- require_once( 'includes/settings-pages/import.php' );
1669	wpsc_options_import();
1670	break;
1671
1672	case 'general' :
1673	default;
1674	- require_once( 'includes/settings-pages/general.php' );
1675	wpsc_options_general();
1676	break;
1677	}
	@@ -1709,7 +1500,6 @@ if ( isset($_POST["edit_var_val"]) )
1709	add_action('wp_ajax_wpsc_update_variations', 'wpsc_update_variations', 50 );
1710
1711	function wpsc_delete_variation_set() {
1712	- global $wpdb;
1713	check_admin_referer( 'delete-variation' );
1714
1715	if ( is_numeric( $_GET['deleteid'] ) ) {
	@@ -1792,41 +1582,6 @@ function wpsc_delete_coupon(){
1792	exit();
1793	}
1794
1795	-
1796	- function wpsc_delete_category() {
1797	- global $wpdb, $wp_rewrite;
1798	-
1799	- check_admin_referer( 'delete-category' );
1800	-
1801	- if ( is_numeric( $_GET['deleteid'] ) ) {
1802	- $category_id = absint( $_GET['deleteid'] );
1803	- $taxonomy = 'wpsc_product_category';
1804	- if ( $category_id > 0 ) {
1805	- wp_delete_term( $category_id, $taxonomy );
1806	- $wpdb->query( "DELETE FROM `" . WPSC_TABLE_META . "` WHERE object_id = '" . $category_id . "' AND object_type = 'wpsc_category'" );
1807	- }
1808	-
1809	- $wp_rewrite->flush_rules();
1810	-
1811	- $deleted = 1;
1812	- }
1813	-
1814	- $sendback = wp_get_referer();
1815	- if ( isset( $deleted ) ) {
1816	- $sendback = add_query_arg( 'deleted', $deleted, $sendback );
1817	- }
1818	- $sendback = remove_query_arg( array(
1819	- 'deleteid',
1820	- 'category_id'
1821	- ), $sendback );
1822	-
1823	- wp_redirect( $sendback );
1824	- exit();
1825	- }
1826	-
1827	- if ( isset( $_REQUEST['wpsc_admin_action'] ) && ( 'wpsc_add_image' == $_REQUEST['wpsc_admin_action'] ) )
1828	- add_action( 'admin_init', 'wpsc_swfupload_images' );
1829	-
1830	if ( isset( $_GET['action'] ) && ( 'purchase_log' == $_GET['action'] ) )
1831	add_action( 'admin_init', 'wpsc_admin_sale_rss' );
1832
	@@ -1839,10 +1594,6 @@ if ( isset( $_REQUEST['ajax'] ) && isset( $_REQUEST['admin'] ) && ($_REQUEST['aj
1839	// Variation set deleting init code starts here
1840	if ( isset( $_REQUEST['wpsc_admin_action'] ) && ( 'wpsc-delete-variation-set' == $_REQUEST['wpsc_admin_action'] ) )
1841	add_action( 'admin_init', 'wpsc_delete_variation_set' );
1842	-
1843	- // Variation set deleting init code starts here
1844	- if ( isset( $_REQUEST['wpsc_admin_action'] ) && ( 'wpsc-delete-category' == $_REQUEST['wpsc_admin_action'] ) )
1845	- add_action( 'admin_init', 'wpsc_delete_category' );
1846
1847	//Delete Coupon
1848	if ( isset( $_REQUEST['wpsc_admin_action'] ) && ( 'wpsc-delete-coupon' == $_REQUEST['wpsc_admin_action'] ) )
	@@ -1888,7 +1639,7 @@ function variation_price_field( $variation ) {
1888	}
1889
1890	if ( isset( $term_id ) && is_array( $term_prices ) && array_key_exists( $term_id, $term_prices ) )
1891	- $price = $term_prices[$term_id]["price"];
1892	else
1893	$price = '';
1894
	@@ -1899,14 +1650,12 @@ function variation_price_field( $variation ) {
1899	<input type="text" name="variation_price" id="variation_price" style="width:50px;" value="<?php echo $price; ?>"><br />
1900	<span class="description"><?php _e( 'You can list a default price here for this variation. You can list a regular price (18.99), differential price (+1.99 / -2) or even a percentage-based price (+50% / -25%).', 'wpsc' ); ?></span>
1901	</div>
1902	- <~~style~~ type="text/~~css~~">
1903	- .form-field #parent option{
1904	- ~~display:none;~~
1905	- }
1906	- ~~.form-field #parent option.level-0{~~
1907	- ~~display:block;~~
1908	- }
1909	- </style>
1910	<?php
1911	} else{
1912	?>


69	}
70
71	function wpsc_ajax_sales_quarterly() {

72	$lastdate = $_POST['add_start'];
73	$date = preg_split( '/-/', $lastdate );
74	if ( !isset( $date[0] ) )

128	add_action( 'admin_init', 'wpsc_delete_file' );
129	}
130











































































































































131	/**
132	Function and action for publishing or unpublishing single products
133	*/
134	function wpsc_ajax_toggle_published() {


135	$product_id = absint( $_GET['product'] );
136	check_admin_referer( 'toggle_publish_' . $product_id );
137

151	* Purposely not duplicating stick post status (logically, products are most often duplicated because they share many attributes, where products are generally 'featured' uniquely.)
152	*/
153	function wpsc_duplicate_product() {


154	// Get the original post
155	$id = absint( $_GET['product'] );
156	$post = wpsc_duplicate_this_dangit( $id );

176	}
177
178	function wpsc_duplicate_product_process( $post ) {
179	+ global $current_user;
180	wp_get_current_user();
181	$user_ID = $current_user->ID;
182

209	);
210	// Insert the new template in the post table
211	$new_post_id = wp_insert_post($defaults);

212
213	// Copy the taxonomies
214	wpsc_duplicate_taxonomies( $post->ID, $new_post_id, $post->post_type );

226	* Copy the taxonomies of a post to another post
227	*/
228	function wpsc_duplicate_taxonomies( $id, $new_id, $post_type ) {
229	+ $taxonomies = get_object_taxonomies( $post_type ); //array("category", "post_tag");
230	+ foreach ( $taxonomies as $taxonomy ) {
231	+ $post_terms = wp_get_object_terms( $id, $taxonomy );
232	+ for ( $i = 0; $i < count( $post_terms ); $i++ ) {
233	+ wp_set_object_terms( $new_id, $post_terms[$i]->slug, $taxonomy, true );




234	}
235	}
236	}

303	}
304
305	function wpsc_purchase_log_csv() {
306	+ global $wpdb, $wpsc_gateways;
307	get_currentuserinfo();
308	$count = 0;
309	if ( ($_GET['rss_key'] == 'key') && is_numeric( $_GET['start_timestamp'] ) && is_numeric( $_GET['end_timestamp'] ) && (current_user_can('edit_post')) ) {

324
325	foreach ( (array)$data as $purchase ) {
326	$form_headers = '';



327	$output .= "\"" . $purchase['id'] . "\","; //Purchase ID
328	$output .= "\"" . $purchase['totalprice'] . "\","; //Purchase Total
329	foreach ( (array)$form_data as $form_field ) {

350	// Go through all products in cart and display quantity and sku
351	foreach ( (array)$cart as $item ) {
352	$skuvalue = get_product_meta($item['prodid'], 'sku', true);
353	+ if(empty($skuvalue)) $skuvalue = __('N/A', 'wpsc');
354	$output .= "\"" . $item['quantity'] . " x " . str_replace( '"', '\"', $item['name'] ) . "\"";
355	$output .= "," . $skuvalue."," ;
356	}

374	}
375
376	function wpsc_admin_ajax() {
377	+ global $wpdb;

378
379	if ( $_POST['action'] == 'product-page-order' ) {
380	$current_order = get_option( 'wpsc_product_page_order' );

467	exit();
468	}
469	}






470	}
471
472	function wpsc_admin_sale_rss() {

502	}
503	}
504









































505	function wpsc_display_invoice() {
506
507	global $body_id;

630	//edit purchase log status function
631	function wpsc_purchlog_edit_status( $purchlog_id='', $purchlog_status='' ) {
632	global $wpdb;
633	+ if ( empty($purchlog_id) && empty($purchlog_status) ) {
634	$purchlog_id = absint( $_POST['purchlog_id'] );
635	$purchlog_status = absint( $_POST['purchlog_status'] );
636	}
637
638	$log_data = $wpdb->get_row( "SELECT * FROM `" . WPSC_TABLE_PURCHASE_LOGS . "` WHERE `id` = '{$purchlog_id}' LIMIT 1", ARRAY_A );
639	+ $is_transaction = wpsc_check_purchase_processed($log_data['processed']);
640	+ if ( $is_transaction && function_exists('wpsc_member_activate_subscriptions')) {
641	wpsc_member_activate_subscriptions( $_POST['id'] );
642	}
643
644	//in the future when everyone is using the 2.0 merchant api, we should use the merchant class to update the staus,
645	// then you can get rid of this hook and have each person overwrite the method that updates the status.
646	do_action('wpsc_edit_order_status', array('purchlog_id'=>$purchlog_id, 'purchlog_data'=>$log_data, 'new_status'=>$purchlog_status));




647
648	$wpdb->query( "UPDATE `" . WPSC_TABLE_PURCHASE_LOGS . "` SET processed='{$purchlog_status}' WHERE id='{$purchlog_id}'" );
649	+
650	+ wpsc_clear_stock_claims();
651	+
652	if ( ($purchlog_id > $log_data['processed']) && ($log_data['processed'] <= 2) && $log_data['email_sent'] == 0 ) {
653	transaction_results($log_data['sessionid'],false,null);
654	}

662	global $wpdb;
663
664	$products = array( );
665	+ foreach ( $_POST['post'] as $product ) {
666	$products[] = absint( $product );
667	}
668

759	*/
760
761	function wpsc_ajax_get_shipping_form() {

762	$shippingname = $_REQUEST['shippingname'];
763	$_SESSION['previous_shipping_name'] = $shippingname;
764	$shipping_data = wpsc_get_shipping_form( $shippingname );

771	}
772
773	function wpsc_ajax_get_payment_form() {

774	$paymentname = $_REQUEST['paymentname'];
775	$_SESSION['previous_payment_name'] = $paymentname;
776	$payment_data = wpsc_get_payment_form( $paymentname );

911
912	update_option( 'custom_shipping_options', $_POST['custom_shipping_options'] );
913
914	+ $shipadd = 0;
915	foreach ( $GLOBALS['wpsc_shipping_modules'] as $shipping ) {
916	foreach ( (array)$_POST['custom_shipping_options'] as $shippingoption ) {
917	if ( $shipping->internal_name == $shippingoption ) {

1016	}
1017
1018	update_option( $option_key, $the_new_link );

1019	}
1020
1021	if(!$auto){

1092	add_action( 'admin_init', 'wpsc_change_region_tax' );
1093
1094	function wpsc_product_files_existing() {


1095	//List all product_files, with checkboxes
1096
1097	$product_id = absint( $_GET["product_id"] );

1143	add_action( 'admin_init', 'wpsc_product_files_existing' );
1144
1145	function prod_upload() {
1146	+ global $wpdb;
1147	$product_id = absint( $_POST["product_id"] );
1148
1149	foreach ( $_POST["select_product_file"] as $selected_file ) {

1196
1197	//change the gateway settings
1198	function wpsc_gateway_settings() {

1199	//To update options
1200	if ( isset( $_POST['wpsc_options'] ) ) {
1201	foreach ( $_POST['wpsc_options'] as $key => $value ) {

1415
1416	//for ajax call of settings page tabs
1417	function wpsc_settings_page_ajax() {


1418	$html = '';
1419	$modified_page_title = $_POST['page_title'];
1420	$page_title = str_replace( "tab-", "", $modified_page_title );

1422	check_admin_referer( $modified_page_title );
1423	switch ( $page_title ) {
1424	case 'checkout' :
1425	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/checkout.php' );
1426	wpsc_options_checkout();
1427	break;
1428
1429	case 'gateway' :
1430	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/gateway.php' );
1431	wpsc_options_gateway();
1432	break;
1433
1434	case 'shipping' :
1435	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/shipping.php' );
1436	wpsc_options_shipping();
1437	break;
1438
1439	case 'admin' :
1440	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/admin.php' );
1441	wpsc_options_admin();
1442	break;
1443
1444	case 'presentation' :
1445	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/presentation.php' );
1446	wpsc_options_presentation();
1447	break;
1448

1451	break;
1452
1453	case 'marketing' :
1454	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/marketing.php' );
1455	wpsc_options_marketing();
1456	break;
1457
1458	case 'import' :
1459	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/import.php' );
1460	wpsc_options_import();
1461	break;
1462
1463	case 'general' :
1464	default;
1465	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/general.php' );
1466	wpsc_options_general();
1467	break;
1468	}

1500	add_action('wp_ajax_wpsc_update_variations', 'wpsc_update_variations', 50 );
1501
1502	function wpsc_delete_variation_set() {

1503	check_admin_referer( 'delete-variation' );
1504
1505	if ( is_numeric( $_GET['deleteid'] ) ) {

1582	exit();
1583	}
1584



































1585	if ( isset( $_GET['action'] ) && ( 'purchase_log' == $_GET['action'] ) )
1586	add_action( 'admin_init', 'wpsc_admin_sale_rss' );
1587

1594	// Variation set deleting init code starts here
1595	if ( isset( $_REQUEST['wpsc_admin_action'] ) && ( 'wpsc-delete-variation-set' == $_REQUEST['wpsc_admin_action'] ) )
1596	add_action( 'admin_init', 'wpsc_delete_variation_set' );




1597
1598	//Delete Coupon
1599	if ( isset( $_REQUEST['wpsc_admin_action'] ) && ( 'wpsc-delete-coupon' == $_REQUEST['wpsc_admin_action'] ) )

1639	}
1640
1641	if ( isset( $term_id ) && is_array( $term_prices ) && array_key_exists( $term_id, $term_prices ) )
1642	+ $price = esc_attr( $term_prices[$term_id]["price"] );
1643	else
1644	$price = '';
1645

1650	<input type="text" name="variation_price" id="variation_price" style="width:50px;" value="<?php echo $price; ?>"><br />
1651	<span class="description"><?php _e( 'You can list a default price here for this variation. You can list a regular price (18.99), differential price (+1.99 / -2) or even a percentage-based price (+50% / -25%).', 'wpsc' ); ?></span>
1652	</div>
1653	+ <script type="text/javascript">
1654	+ jQuery('.form-field #parent option:not(.level-0, [value="-1"])').remove();
1655	+ jQuery('#parent').mousedown(function(){
1656	+ jQuery('.form-field #parent option:not(.level-0, [value="-1"])').remove();
1657	+ });
1658	+ </script>


1659	<?php
1660	} else{
1661	?>

wpsc-admin/css/admin.css CHANGED Viewed

	@@ -42,7 +42,7 @@ padding-left:5px;
42	}
43	.pricedisplay, .salespricedisplay{
44	/* width:40%; */
45	- float:left;
46	}
47	.dashboardWidgetSpecial{
48	font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;
	@@ -95,7 +95,7 @@ th#purchid{
95	width:60px;
96	}
97	th#details{
98	- width:~~55px~~;
99	}
100	th#amount{
101	width:75px;
	@@ -107,10 +107,10 @@ th#track{
107	width:75px;
108	}
109	th#delete{
110	- width:~~55px~~;
111	}
112	th#status{
113	- width:~~120px~~;
114	}
115	.google_checkout_logo{
116	padding-right:10px;


42	}
43	.pricedisplay, .salespricedisplay{
44	/* width:40%; */
45	+ /float:left;/
46	}
47	.dashboardWidgetSpecial{
48	font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;

95	width:60px;
96	}
97	th#details{
98	+ width:100px;
99	}
100	th#amount{
101	width:75px;

107	width:75px;
108	}
109	th#delete{
110	+ width:60px;
111	}
112	th#status{
113	+ width:150px;
114	}
115	.google_checkout_logo{
116	padding-right:10px;

wpsc-admin/display-coupons.php CHANGED Viewed

	@@ -331,27 +331,27 @@ function wpsc_display_coupons_page() {
331	echo "<tr $alternate>\n\r";
332
333	echo " <td>\n\r";
334	- ~~echo~~ $coupon['coupon_code'];
335	echo " </td>\n\r";
336
337	echo " <td>\n\r";
338	if ( $coupon['is-percentage'] == 1 )
339	- echo $coupon['value'] . "%";
340
341	else if ( $coupon['is-percentage'] == 2 )
342	- echo "Free Shipping";
343
344	else
345	- echo wpsc_currency_display( $coupon['value'] );
346
347	echo " </td>\n\r";
348
349	echo " <td>\n\r";
350	- echo date( "d/m/Y", strtotime( $coupon['start'] ) );
351	echo " </td>\n\r";
352
353	echo " <td>\n\r";
354	- echo date( "d/m/Y", strtotime( $coupon['expiry'] ) );
355	echo " </td>\n\r";
356
357	echo " <td>\n\r";
	@@ -379,7 +379,7 @@ function wpsc_display_coupons_page() {
379
380	echo " </td>\n\r";
381	echo " <td>\n\r";
382	- echo "<a title='" . $coupon['coupon_code'] . "' href='#' rel='" . $coupon['id'] . "' class='wpsc_edit_coupon' >" . __( 'Edit', 'wpsc' ) . "</a>";
383	echo " </td>\n\r";
384	echo " </tr>\n\r";
385	echo " <tr class='coupon_edit'>\n\r";


331	echo "<tr $alternate>\n\r";
332
333	echo " <td>\n\r";
334	+ esc_attr_e( $coupon['coupon_code'] );
335	echo " </td>\n\r";
336
337	echo " <td>\n\r";
338	if ( $coupon['is-percentage'] == 1 )
339	+ echo esc_attr( $coupon['value'] ) . "%";
340
341	else if ( $coupon['is-percentage'] == 2 )
342	+ echo __("Free Shipping", 'wpsc');
343
344	else
345	+ echo wpsc_currency_display( esc_attr( $coupon['value'] ) );
346
347	echo " </td>\n\r";
348
349	echo " <td>\n\r";
350	+ echo date( "d/m/Y", strtotime( esc_attr( $coupon['start'] ) ) );
351	echo " </td>\n\r";
352
353	echo " <td>\n\r";
354	+ echo date( "d/m/Y", strtotime( esc_attr( $coupon['expiry'] ) ) );
355	echo " </td>\n\r";
356
357	echo " <td>\n\r";

379
380	echo " </td>\n\r";
381	echo " <td>\n\r";
382	+ echo "<a title='" . esc_attr( $coupon['coupon_code'] ). "' href='#' rel='" . $coupon['id'] . "' class='wpsc_edit_coupon' >" . __( 'Edit', 'wpsc' ) . "</a>";
383	echo " </td>\n\r";
384	echo " </tr>\n\r";
385	echo " <tr class='coupon_edit'>\n\r";

wpsc-admin/display-groups.page.php DELETED Viewed

@@ -1,7 +0,0 @@
-            -
            <?php
-            -
            /*
-            -
             * Deprecated file
-            -
             * @since 3.8
-            -
             */
-            -
-            -
            ?>

wpsc-admin/display-items.page.php CHANGED Viewed

	@@ -117,13 +117,13 @@ function wpsc_additional_column_data( $column ) {
117	$src = wp_get_attachment_url( $attached_image->ID );
118	?>
119	<div style='width:38px; height:38px; overflow:hidden;'>
120	- <img title='<?php _e( 'Drag to a new position' ); ?>' src='<?php echo $src; ?>' alt='<?php echo $title; ?>' width='38' height='38' />
121	</div>
122	<?php
123	} else {
124	$image_url = WPSC_CORE_IMAGES_URL . "/no-image-uploaded.gif";
125	?>
126	- <img title='<?php _e( 'Drag to a new position' ); ?>' src='<?php echo $image_url; ?>' alt='<?php echo $title; ?>' width='38' height='38' />
127	<?php
128	}
129	break;
	@@ -174,7 +174,7 @@ function wpsc_additional_column_data( $column ) {
174	case 'stock' :
175	$stock = get_post_meta( $post->ID, '_wpsc_stock', true );
176	if( $stock == '' )
177	- $stock = 'N/A';
178	if( !$is_parent ) {
179	echo $stock;
180	echo '<div id="inline_' . $post->ID . '_stock" class="hidden">' . $stock . '</div>';
	@@ -187,13 +187,6 @@ function wpsc_additional_column_data( $column ) {
187	$has_var = '1';
188	if( !$is_parent ) {
189	echo wpsc_currency_display( $price );
190	- $args = array(
191	- 'display_currency_symbol' => false,
192	- 'display_decimal_point' => true,
193	- 'display_currency_code' => false,
194	- 'display_as_html' => false
195	- );
196	- $price = wpsc_currency_display( $price, $args );
197	echo '<div id="inline_' . $post->ID . '_price" class="hidden">' . trim($price) . '</div>';
198	$has_var = '0';
199	}
	@@ -213,7 +206,7 @@ function wpsc_additional_column_data( $column ) {
213	case 'SKU' :
214	$sku = get_post_meta( $post->ID, '_wpsc_sku', true );
215	if( $sku == '' )
216	- $sku = 'N/A';
217
218	echo $sku;
219	echo '<div id="inline_' . $post->ID . '_sku" class="hidden">' . $sku . '</div>';
	@@ -265,22 +258,24 @@ function wpsc_column_sql_orderby( $orderby, $wp_query ) {
265
266	$wp_query->query = wp_parse_args( $wp_query->query );
267
268	- ~~switch~~ ( $wp_query->query['orderby'] ) :
269	- ~~case~~ '~~stock~~' :
270	- ~~$orderby~~ ~~= "(SELECT meta_value FROM $wpdb->postmeta WHERE post_id = $wpdb->posts.ID AND meta_key =~~ '~~_wpsc_stock~~') ~~" . $wp_query->get('order');~~
271	- ~~break~~;
272	- ~~case 'price' :~~
273	- ~~$orderby~~ ~~= "(SELECT meta_value FROM $wpdb->postmeta WHERE post_id = $wpdb->posts.ID AND meta_key =~~ '~~_wpsc_price~~') ~~" . $wp_query->get('order');~~
274	- ~~break~~;
275	- ~~case 'sale_price' :~~
276	- ~~$orderby~~ ~~= "(SELECT meta_value FROM $wpdb->postmeta WHERE post_id = $wpdb->posts.ID AND meta_key =~~ '~~_wpsc_special_price~~') ~~" . $wp_query->get('order');~~
277	- ~~break~~;
278	- ~~case 'SKU' :~~
279	- ~~$orderby~~ ~~= "(SELECT meta_value FROM $wpdb->postmeta WHERE post_id = $wpdb->posts.ID AND meta_key =~~ '~~_wpsc_sku~~') ~~" . $wp_query->get('order');~~
280	- ~~break~~;
281	- ~~endswitch~~;


282
283	- return $orderby;
284	}
285	function wpsc_cats_restrict_manage_posts() {
286	global $typenow;
	@@ -295,12 +290,11 @@ function wpsc_cats_restrict_manage_posts() {
295	$tax_name = $tax_obj->labels->name;
296	// retrieve array of term objects per taxonomy
297	$terms = get_terms( $tax_slug );
298	-
299	// output html for taxonomy dropdown filter
300	echo "<select name='$tax_slug' id='$tax_slug' class='postform'>";
301	echo "<option value=''>" . sprintf(_x('Show All %s', 'Show all [category name]', 'wpsc'), $tax_name) . "</option>";
302	foreach ( $terms as $term )
303	- echo '<option value='. $term->slug, $_GET[$tax_slug] == $term->slug ? ' selected="selected"' : '','>' . $term->name .' (' . $term->count .')</option>';
304	echo "</select>";
305	}
306	}


117	$src = wp_get_attachment_url( $attached_image->ID );
118	?>
119	<div style='width:38px; height:38px; overflow:hidden;'>
120	+ <img title='<?php _e( 'Drag to a new position', 'wpsc' ); ?>' src='<?php echo $src; ?>' alt='<?php echo $title; ?>' width='38' height='38' />
121	</div>
122	<?php
123	} else {
124	$image_url = WPSC_CORE_IMAGES_URL . "/no-image-uploaded.gif";
125	?>
126	+ <img title='<?php _e( 'Drag to a new position', 'wpsc' ); ?>' src='<?php echo $image_url; ?>' alt='<?php echo $title; ?>' width='38' height='38' />
127	<?php
128	}
129	break;

174	case 'stock' :
175	$stock = get_post_meta( $post->ID, '_wpsc_stock', true );
176	if( $stock == '' )
177	+ $stock = __('N/A', 'wpsc');
178	if( !$is_parent ) {
179	echo $stock;
180	echo '<div id="inline_' . $post->ID . '_stock" class="hidden">' . $stock . '</div>';

187	$has_var = '1';
188	if( !$is_parent ) {
189	echo wpsc_currency_display( $price );







190	echo '<div id="inline_' . $post->ID . '_price" class="hidden">' . trim($price) . '</div>';
191	$has_var = '0';
192	}

206	case 'SKU' :
207	$sku = get_post_meta( $post->ID, '_wpsc_sku', true );
208	if( $sku == '' )
209	+ $sku = __('N/A', 'wpsc');
210
211	echo $sku;
212	echo '<div id="inline_' . $post->ID . '_sku" class="hidden">' . $sku . '</div>';

258
259	$wp_query->query = wp_parse_args( $wp_query->query );
260
261	+ if( isset( $wp_query->query['orderby'] ) ) :
262	+ switch ( $wp_query->query['orderby'] ) :
263	+ case 'stock' :
264	+ $orderby = "(SELECT meta_value FROM $wpdb->postmeta WHERE post_id = $wpdb->posts.ID AND meta_key = '_wpsc_stock') " . $wp_query->get('order');
265	+ break;
266	+ case 'price' :
267	+ $orderby = "(SELECT meta_value FROM $wpdb->postmeta WHERE post_id = $wpdb->posts.ID AND meta_key = '_wpsc_price') " . $wp_query->get('order');
268	+ break;
269	+ case 'sale_price' :
270	+ $orderby = "(SELECT meta_value FROM $wpdb->postmeta WHERE post_id = $wpdb->posts.ID AND meta_key = '_wpsc_special_price') " . $wp_query->get('order');
271	+ break;
272	+ case 'SKU' :
273	+ $orderby = "(SELECT meta_value FROM $wpdb->postmeta WHERE post_id = $wpdb->posts.ID AND meta_key = '_wpsc_sku') " . $wp_query->get('order');
274	+ break;
275	+ endswitch;
276	+ endif;
277
278	+ return $orderby;
279	}
280	function wpsc_cats_restrict_manage_posts() {
281	global $typenow;

290	$tax_name = $tax_obj->labels->name;
291	// retrieve array of term objects per taxonomy
292	$terms = get_terms( $tax_slug );

293	// output html for taxonomy dropdown filter
294	echo "<select name='$tax_slug' id='$tax_slug' class='postform'>";
295	echo "<option value=''>" . sprintf(_x('Show All %s', 'Show all [category name]', 'wpsc'), $tax_name) . "</option>";
296	foreach ( $terms as $term )
297	+ echo '<option value='. $term->slug, ( isset($_GET[$tax_slug]) && $_GET[$tax_slug] == $term->slug) ? ' selected="selected"' : '','>' . $term->name .' (' . $term->count .')</option>';
298	echo "</select>";
299	}
300	}

wpsc-admin/display-options-settings.page.php CHANGED Viewed

	@@ -47,27 +47,27 @@ function wpsc_display_settings_page() { ?>
47	<?php
48	switch ( $page ) {
49	case 'checkout' :
50	- require_once( 'includes/settings-pages/checkout.php' );
51	wpsc_options_checkout();
52	break;
53
54	case 'gateway' :
55	- require_once( 'includes/settings-pages/gateway.php' );
56	wpsc_options_gateway();
57	break;
58
59	case 'shipping' :
60	- require_once( 'includes/settings-pages/shipping.php' );
61	wpsc_options_shipping();
62	break;
63
64	case 'admin' :
65	- require_once( 'includes/settings-pages/admin.php' );
66	wpsc_options_admin();
67	break;
68
69	case 'presentation' :
70	- require_once( 'includes/settings-pages/presentation.php' );
71	wpsc_options_presentation();
72	break;
73
	@@ -76,18 +76,18 @@ function wpsc_display_settings_page() { ?>
76	break;
77
78	case 'marketing' :
79	- require_once( 'includes/settings-pages/marketing.php' );
80	wpsc_options_marketing();
81	break;
82
83	case 'import' :
84	- require_once( 'includes/settings-pages/import.php' );
85	wpsc_options_import();
86	break;
87
88	case 'general' :
89	default :
90	- require_once( 'includes/settings-pages/general.php' );
91	wpsc_options_general();
92	break;
93	}
	@@ -106,15 +106,15 @@ function wpsc_display_settings_page() { ?>
106
107	function wpsc_settings_tabs() {
108	$_default_tabs = array(
109	- 'general' => __( 'General', 'wpsc' ),
110	- 'presentation' => __( 'Presentation', 'wpsc' ),
111	- 'admin' => __( 'Admin', 'wpsc' ),
112	- 'taxes' => __( 'Taxes', 'wpsc' ),
113	- 'shipping' => __( 'Shipping', 'wpsc' ),
114	- 'gateway' => __( 'Payments', 'wpsc' ),
115	- 'checkout' => __( 'Checkout', 'wpsc' ),
116	- 'marketing' => __( 'Marketing', 'wpsc' ),
117	- 'import' => __( 'Import', 'wpsc' )
118	);
119
120	return apply_filters( 'wpsc_settings_tabs', $_default_tabs );
	@@ -221,7 +221,7 @@ function wpsc_get_payment_form( $paymentname ,$selected_gateway_data='') {
221	$output ='';
222	$output .="<tr>
223	<td style='border-top: none;'>
224	- ".__("Display Name")."
225	</td>
226	<td style='border-top: none;'>";
227
	@@ -251,7 +251,7 @@ function wpsc_get_payment_form( $paymentname ,$selected_gateway_data='') {
251	}
252
253	$output .="<input type='text' name='user_defined_name[".$paymentname."]' value='". $display_name ."' /><br />
254	- <span class='small description'>".__('The text that people see when making a purchase')."</span>
255	</td>
256	</tr>";
257	$payment_forms = $form["form"]();
	@@ -273,22 +273,22 @@ function wpsc_settings_page_update_notification() {
273	<?php
274
275	if ( isset( $_GET['updated'] ) && (int)$_GET['updated'] ) {
276	- printf( _n( ' Setting options updated.', ' %s Settings options updated.', $_GET['updated'] ), ~~number_format_i18n~~( $_GET['updated'] ) );
277	unset( $_GET['updated'] );
278	$message = true;
279	}
280	if ( isset( $_GET['deleted'] ) && (int)$_GET['deleted'] ) {
281	- printf( _n( '%s Setting option deleted.', '%s Setting option deleted.', $_GET['deleted'] ), ~~number_format_i18n~~( $_GET['deleted'] ) );
282	unset( $_GET['deleted'] );
283	$message = true;
284	}
285	if ( isset( $_GET['shipadd'] ) && (int)$_GET['shipadd'] ) {
286	- printf( _n( ' Shipping option updated.', ' Shipping option updated.', $_GET['shipadd'] ), ~~number_format_i18n~~( $_GET['shipadd'] ) );
287	unset( $_GET['shipadd'] );
288	$message = true;
289	}
290	if ( isset( $_GET['added'] ) && (int)$_GET['added'] ) {
291	- printf( _n( '%s Checkout field added.', '%s Checkout fields added.', $_GET['added'] ), ~~number_format_i18n~~( $_GET['added'] ) );
292	unset( $_GET['added'] );
293	$message = true;
294	}


47	<?php
48	switch ( $page ) {
49	case 'checkout' :
50	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/checkout.php' );
51	wpsc_options_checkout();
52	break;
53
54	case 'gateway' :
55	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/gateway.php' );
56	wpsc_options_gateway();
57	break;
58
59	case 'shipping' :
60	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/shipping.php' );
61	wpsc_options_shipping();
62	break;
63
64	case 'admin' :
65	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/admin.php' );
66	wpsc_options_admin();
67	break;
68
69	case 'presentation' :
70	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/presentation.php' );
71	wpsc_options_presentation();
72	break;
73

76	break;
77
78	case 'marketing' :
79	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/marketing.php' );
80	wpsc_options_marketing();
81	break;
82
83	case 'import' :
84	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/import.php' );
85	wpsc_options_import();
86	break;
87
88	case 'general' :
89	default :
90	+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/settings-pages/general.php' );
91	wpsc_options_general();
92	break;
93	}

106
107	function wpsc_settings_tabs() {
108	$_default_tabs = array(
109	+ 'general' => _x( 'General', 'General settings tab in Settings->Store page', 'wpsc' ),
110	+ 'presentation' => _x( 'Presentation', 'Presentation settings tab in Settings->Store page', 'wpsc' ),
111	+ 'admin' => _x( 'Admin', 'Admin settings tab in Settings->Store page', 'wpsc' ),
112	+ 'taxes' => _x( 'Taxes', 'Taxes settings tab in Settings->Store page', 'wpsc' ),
113	+ 'shipping' => _x( 'Shipping', 'Shipping settings tab in Settings->Store page', 'wpsc' ),
114	+ 'gateway' => _x( 'Payments', 'Payments settings tab in Settings->Store page', 'wpsc' ),
115	+ 'checkout' => _x( 'Checkout', 'Checkout settings tab in Settings->Store page', 'wpsc' ),
116	+ 'marketing' => _x( 'Marketing', 'Marketing settings tab in Settings->Store page', 'wpsc' ),
117	+ 'import' => _x( 'Import', 'Import settings tab in Settings->Store page', 'wpsc' )
118	);
119
120	return apply_filters( 'wpsc_settings_tabs', $_default_tabs );

221	$output ='';
222	$output .="<tr>
223	<td style='border-top: none;'>
224	+ ".__("Display Name", 'wpsc')."
225	</td>
226	<td style='border-top: none;'>";
227

251	}
252
253	$output .="<input type='text' name='user_defined_name[".$paymentname."]' value='". $display_name ."' /><br />
254	+ <span class='small description'>".__('The text that people see when making a purchase', 'wpsc')."</span>
255	</td>
256	</tr>";
257	$payment_forms = $form["form"]();

273	<?php
274
275	if ( isset( $_GET['updated'] ) && (int)$_GET['updated'] ) {
276	+ printf( _n( '%s Setting options updated.', ' %s Settings options updated.', $_GET['updated'] ), absint( $_GET['updated'] ) );
277	unset( $_GET['updated'] );
278	$message = true;
279	}
280	if ( isset( $_GET['deleted'] ) && (int)$_GET['deleted'] ) {
281	+ printf( _n( '%s Setting option deleted.', '%s Setting option deleted.', $_GET['deleted'] ), absint( $_GET['deleted'] ) );
282	unset( $_GET['deleted'] );
283	$message = true;
284	}
285	if ( isset( $_GET['shipadd'] ) && (int)$_GET['shipadd'] ) {
286	+ printf( _n( '%s Shipping option updated.', '%s Shipping option updated.', $_GET['shipadd'] ), absint( $_GET['shipadd'] ) );
287	unset( $_GET['shipadd'] );
288	$message = true;
289	}
290	if ( isset( $_GET['added'] ) && (int)$_GET['added'] ) {
291	+ printf( _n( '%s Checkout field added.', '%s Checkout fields added.', $_GET['added'] ), absint( $_GET['added'] ) );
292	unset( $_GET['added'] );
293	$message = true;
294	}

wpsc-admin/display-sales-logs.php CHANGED Viewed

	@@ -46,14 +46,14 @@ function wpsc_display_sales_logs() {
46	if(!isset($_REQUEST['purchaselog_id'])){
47	$columns = array(
48	'cb' => '<input type="checkbox" />',
49	- 'purchid' => 'Order ID',
50	- 'date' => 'Date / Time',
51	'name' => '',
52	- 'amount' => 'Amount',
53	- 'details' => 'Details',
54	- 'status' => 'Status',
55	- 'delete' => 'Delete',
56	- 'track' => 'Tracking ID'
57	);
58	register_column_headers('display-sales-list', $columns);
59	///// start of update message section //////
	@@ -62,7 +62,7 @@ function wpsc_display_sales_logs() {
62	if (isset($_GET['skipped']) \|\| isset($_GET['updated']) \|\| isset($_GET['deleted']) \|\| isset($_GET['locked']) ) { ?>
63	<div id="message" class="updated fade"><p>
64	<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
65	- printf( _n( '%s Purchase Log updated.', '%s Purchase Logs updated.', $_GET['updated'] ), ~~number_format_i18n~~( $_GET['updated'] ) );
66	unset($_GET['updated']);
67	}
68
	@@ -70,12 +70,12 @@ function wpsc_display_sales_logs() {
70	unset($_GET['skipped']);
71
72	if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
73	- printf( _n( '%s product not updated, somebody is editing it.', '%s products not updated, somebody is editing them.', $_GET['locked'] ), ~~number_format_i18n~~( $_GET['locked'] ) );
74	unset($_GET['locked']);
75	}
76
77	if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
78	- printf( _n( '%s Purchase Log deleted.', '%s Purchase Logs deleted.', $_GET['deleted'] ), ~~number_format_i18n~~( $_GET['deleted'] ) );
79	unset($_GET['deleted']);
80	}
81	?>
	@@ -83,7 +83,7 @@ function wpsc_display_sales_logs() {
83	<?php }
84
85	if(get_option('wpsc_purchaselogs_fixed')== false \|\| (wpsc_check_uniquenames()) ){ ?>
86	- <div class='error' style='padding:8px;line-spacing:8px;'><span ><?php _e('When upgrading the WP e-Commerce Plugin from 3.6.* to 3.7 it is required that you associate your checkout form fields with the new Purchase Logs system. To do so please ~~'); ?>~~ <a href=~~'<?php echo $fixpage; ?>'><?php _e('~~Click Here','wpsc'); ?></~~a></~~span></div>
87	<?php }
88	///// end of update message section //////?>
89	<div id='dashboard-widgets' style='min-width: 825px;'>
	@@ -92,11 +92,9 @@ function wpsc_display_sales_logs() {
92	<div id='dashboard-widgets-main-content-wpsc' class='has-sidebar-content'>
93
94	<?php
95	- if(~~function_exists(~~'~~wpsc_right_now~~')~~) {~~
96	- ~~echo~~ ~~wpsc_right_now(~~);
97	- }
98	-
99	- ?>
100	</div><br />
101	<div id='wpsc_purchlog_searchbox'>
102	<?php wpsc_purchaselogs_searchbox(); ?>
	@@ -104,6 +102,9 @@ function wpsc_display_sales_logs() {
104	<?php wpsc_purchaselogs_displaylist(); ?>
105
106	</div>



107	</div>
108	<?php }else{ //NOT IN GENERIC PURCHASE LOG PAGE, IN DETAILS PAGE PER PURCHASE LOG
109
	@@ -114,11 +115,11 @@ function wpsc_display_sales_logs() {
114	<div id="message" class="updated fade"><p>
115	<?php
116	if ( isset($_GET['cleared']) && $_GET['cleared']==true ) {
117	- ~~printf~~( ~~_n(~~ 'Downloads for this log have been released.', '~~Downloads for this log have been released.~~', ~~$_GET['cleared']~~ )~~, $_GET['cleared'])~~;
118	unset($_GET['cleared']);
119	}
120	if ( isset($_GET['sent']) && (int) $_GET['sent'] ) {
121	- ~~printf~~( ~~_n(~~ 'Receipt has been resent ', '~~Receipt has been resent~~ ', ~~$_GET['sent']~~ )~~, $_GET['sent'] )~~;
122	unset($_GET['sent']);
123	}
124	?> </p></div>
	@@ -266,7 +267,7 @@ function wpsc_display_sales_logs() {
266
267	<br /><br class='small' /><img src='<?php echo WPSC_CORE_IMAGES_URL; ?>/email_go.png' alt='email icon' />&ensp;<a href='<?php echo add_query_arg('email_buyer_id',$_GET['purchaselog_id']); ?>'><?php _e('Resend Receipt to Buyer', 'wpsc'); ?></a>
268
269	- <br /><br class='small' /><a class='submitdelete' title='<?php echo esc_attr(__('Delete this log')); ?>' href='<?php echo wp_nonce_url("admin.php?wpsc_admin_action=delete_purchlog&purchlog_id=".$_GET['purchaselog_id'], 'delete_purchlog_' .$_GET['purchaselog_id']); ?>' onclick="if ( confirm(' <?php echo esc_js(sprintf( __("You are about to delete this log '%s'\n 'Cancel' to stop, 'OK' to delete.",'wpsc'), wpsc_purchaselog_details_date() )) ?>') ) { return true;}return false;"><img src='<?php echo WPSC_CORE_IMAGES_URL . "/cross.png"; ?>' alt='delete icon' />  <?php _e('Remove this record', 'wpsc') ?></a>
270
271	<br /><br class='small' />&emsp;&ensp; <a href='<?php echo $page_back ?>'><?php _e('Go Back', 'wpsc'); ?></a>
272	<br /><br />
	@@ -278,119 +279,23 @@ function wpsc_display_sales_logs() {
278	<?php
279
280	}
281	-
282	- function display_ecomm_admin_menu(){
283	- ?>
284	- <div class="meta-box-sortables ui-sortable" style="position: relative;">
285	- <div class='postbox'>
286	- <h3 class='hndle'><?php _e('e-Commerce Admin Menu', 'wpsc'); ?></h3>
287	- <div class='inside'>
288	- <a href='admin.php?page=wpsc-settings'><?php _e('Shop Settings', 'wpsc'); ?></a><br />
289	- <a href='admin.php?page=wpsc-settings&tab=gateway'><?php _e('Checkout Settings', 'wpsc'); ?></a><br />
290	- <a href='admin.php?page=wpsc-settings&tab=checkout'><?php _e('Checkout Settings', 'wpsc'); ?></a><br />
291	- </div>
292	- </div>
293	- </div>
294	- <?php
295	- }
296	- function display_ecomm_rss_feed(){
297	- require_once (ABSPATH . WPINC . '/rss.php');
298	- $rss = fetch_rss('http://www.instinct.co.nz/feed/');
299	- if($rss != null) {
300	- $rss->items = array_slice((array)$rss->items, 0, 5);
301	- $current_hash = sha1(serialize($rss->items));
302	- if((string)get_option('wpsc_ecom_news_hash') !== (string)$current_hash ) {
303	- ?>
304	- <div class='postbox'>
305	- <h3 class='hndle'><?php _e('WP e-Commerce News', 'wpsc'); ?></h3>
306	- <div class='inside'>
307	- <ul class='ecom_dashboard'>
308	- <?php
309	- foreach($rss->items as $items) {
310	- echo "<li><a href='".$items['link']."'>".$items['title']."</a></li>";
311	- }
312	- ?>
313	- </ul>
314	- <?php
315	- if (!IS_WP27)
316	- echo "<a href='admin.php?page=<?php echo WPSC_DIR_NAME;?>/display-sales-log.php&hide_news=true' id='close_news_box'>X</a>";
317	- ?>
318	- </div>
319	- </div>
320	- <?php
321	- }
322	- }
323	-
324	- function wpsc_ordersummary(){
325	- ?>
326	- <div class='postbox'>
327	- <h3 class='hndle'><?php _e('Order Summary', 'wpsc'); ?></h3>
328	-
329	- <div class='inside'>
330	- <div class='order_summary_subsection'>
331	- <strong><?php _e('Current Month', 'wpsc'); ?></strong>
332	- <p id='log_total_month'>
333	- <?php
334	- $year = date("Y");
335	- $month = date("m");
336	- $start_timestamp = mktime(0, 0, 0, $month, 1, $year);
337	- $end_timestamp = mktime(0, 0, 0, ($month+1), 0, $year);
338	- echo wpsc_currency_display( admin_display_total_price( $start_timestamp,$end_timestamp ) );
339	- echo " ".__('(accepted payments)', 'wpsc'); ?>
340	- </p>
341	- </div>
342	- <div class='order_summary_subsection'>
343	- <strong><?php _e('Total Income', 'wpsc'); ?></strong>
344	- <p id='log_total_absolute'><?php echo wpsc_currency_display( admin_display_total_price() ); ?></p>
345	- </div>
346	-
347	- <div class='order_summary_subsection'>
348	- <strong><?php _e('Subscribe to your orders', 'wpsc'); ?></strong>
349	- <p>
350	- <a class='product_log_rss' href='index.php?rss=true&rss_key=key&action=purchase_log'><img align='middle' src='<?php echo WPSC_CORE_IMAGES_URL; ?>/rss-icon.jpg' alt='' title='' /> <span><?php _e('Subscribe to an RSS feed', 'wpsc'); ?></span></a> <?php _e('of your orders', 'wpsc'); ?> </p>
351	- </div>
352	- <div class='order_summary_subsection'>
353	- <strong><?php _e('Plugin News', 'wpsc'); ?></strong>
354	- <p>
355	- <?php _e('The <a href="http://instinct.co.nz/blogshop/products-page/" target="_blank">WP DropShop Module</a> is the latest and most cutting edge shopping cart available online. Coupled with Grid View then your site will be the talk of street! <br/><br/>The <a href="http://instinct.co.nz/blogshop/products-page/" target="_blank">GridView Module</a> is a visual module built to enhance the way your product page looks.<br/><br/><a href="http://www.instinct.co.nz/wp-campaign-monitor/100">WP Campaign Monitor</a> is an email newsletter tool built just for WP users who want to send campaigns, track the results and manage their subscribers. The latest version integrates with e-commerce lite meaning that you will be able to send buyers email newsletters and much more. ', 'wpsc'); ?>
356	- <br /><br /><?php _e('This shop is powered by ', 'wpsc'); ?><a href='http://www.instinct.co.nz'>Instinct</a>
357	- </p>
358	- </div>
359	- </div>
360	- <?php
361	- if(get_option('activation_state') != "true") {
362	- ?>
363	- <div class='gold-cart_pesterer'>
364	- <div>
365	- <img src='<?php echo WPSC_CORE_IMAGES_URL; ?>/gold-cart.png' alt='' title='' /><a href='http://www.instinct.co.nz/e-commerce/shop/'><?php _e('Upgrade to Gold', 'wpsc'); ?></a><?php _e(' and unleash more functionality into your shop.', 'wpsc'); ?>
366	- </div>
367	- </div>
368	-
369	- <?php
370	- }
371	- ?>
372	- </div>
373	-
374	- <?php
375	- }
376	-
377	- }
378	function wpsc_purchaselogs_displaylist(){
379	global $purchlogs;
380	?>
381	<form method='post' action=''>
382	<div class='wpsc_purchaselogs_options'>
383	<select id='purchlog_multiple_status_change' name='purchlog_multiple_status_change' class='purchlog_multiple_status_change'>
384	- <option selected='selected' value='-1'><?php _e('Bulk Actions'); ?></option>
385	<?php while(wpsc_have_purch_items_statuses()) : wpsc_the_purch_status(); ?>
386	<option value='<?php echo wpsc_the_purch_status_id(); ?>' >
387	<?php echo wpsc_the_purch_status_name(); ?>
388	</option>
389	<?php endwhile; ?>
390	- <option value="delete"><?php _e('Delete'); ?></option>
391	</select>
392	<input type='hidden' value='purchlog_bulk_modify' name='wpsc_admin_action2' />
393	- <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
394	<?php /* View functions for purchlogs */?>
395	<label for='view_purchlogs_by'><?php _e('View:'); ?></label>
396
	@@ -413,8 +318,8 @@ function wpsc_display_sales_logs() {
413	}
414
415	?>
416	- <option value='all' <?php echo $date_is_selected['all']; ~~?>>~~All</option>
417	- <option value='3mnths' <?php echo $date_is_selected['3mnths']; ~~?>>~~Three Months</option>
418	<?php echo wpsc_purchlogs_getfirstdates(); ?>
419	</select>
420	<select id='view_purchlogs_by_status' name='view_purchlogs_by_status'>
	@@ -438,13 +343,13 @@ function wpsc_display_sales_logs() {
438	}else{
439	$is_selected = '';
440	} ?>
441	- <option <?php echo $is_selected; ?> value='-1'>Status: All</option>
442	</select>
443	<input type='hidden' value='purchlog_filter_by' name='wpsc_admin_action' />
444	- <input type="submit" value="<?php _e('Filter'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
445	</div>
446	<?php if( isset( $_POST['purchlogs_searchbox'] ) && wpsc_have_purch_items() == false ): ?>
447	- <div class="updated settings-error"><p><?php _e('There are no purchase logs for your selection, please try again.'); ?></p></div>
448	<?php endif;?>
449	<table class="widefat page fixed" cellspacing="0">
450	<thead>
	@@ -461,7 +366,7 @@ function wpsc_display_sales_logs() {
461	<?php get_purchaselogs_content(); ?>
462	</tbody>
463	</table>
464	- <p><strong ~~style='float:left'~~ ><?php _e('Total:'); ?></strong> <?php echo wpsc_currency_display( wpsc_the_purch_total() ); ?></p>
465	<?php
466	if(!isset($purchlogs->current_start_timestamp) && !isset($purchlogs->current_end_timestamp)){
467	$purchlogs->current_start_timestamp = $purchlogs->earliest_timestamp;
	@@ -482,7 +387,7 @@ function wpsc_display_sales_logs() {
482	$(document).ready(function(){
483	$('#doaction, #doaction2').click(function(){
484	if ( $('select[name^="purchlog_multiple_status_change"]').val() == 'delete' ) {
485	- var m = '<?php echo esc_js(__("You are about to delete the selected purchase logs.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
486	return showNotice.warn(m);
487	}
488	});
	@@ -506,7 +411,10 @@ function wpsc_display_sales_logs() {
506	<td><?php echo wpsc_the_purch_item_date(); ?></td> <!--Date -->
507	<td><?php echo wpsc_the_purch_item_name(); ?></td> <!--Name/email -->
508	<td><?php echo wpsc_currency_display( wpsc_the_purch_item_price() ); ?></td><!-- Amount -->
509	- <td><a href='<?php echo htmlentities(add_query_arg('purchaselog_id', wpsc_the_purch_item_id()), ENT_QUOTES, 'UTF-8') ; ?>'><?php ~~echo wpsc_the_purch_item_details();?> Items</a></td><!-- Details -->~~



510	<td>
511	<?php if(!wpsc_purchlogs_is_google_checkout()){ ?>
512	<select class='selector' name='<?php echo wpsc_the_purch_item_id(); ?>' title='<?php echo wpsc_the_purch_item_id(); ?>' >
	@@ -518,7 +426,7 @@ function wpsc_display_sales_logs() {
518	<a href='http://checkout.google.com/' rel=''><img class='google_checkout_logo' src='<?php echo WPSC_CORE_IMAGES_URL . "/checkout_logo.jpg"; ?>' alt='google checkout' /></a>
519	<?php } ?>
520	</td><!-- Status -->
521	- <td><a class='submitdelete' title='<?php echo esc_attr(__('Delete this log')); ?>' href='<?php echo wp_nonce_url("admin.php?wpsc_admin_action=delete_purchlog&purchlog_id=".wpsc_the_purch_item_id(), 'delete_purchlog_' . wpsc_the_purch_item_id()); ?>' onclick="if ( confirm(' <?php echo esc_js(sprintf( __("You are about to delete this log '%s'\n 'Cancel' to stop, 'OK' to delete."), wpsc_the_purch_item_date() )) ?>') ) { return true;}return false;"><img class='wpsc_pushdown_img' src='<?php echo WPSC_CORE_IMAGES_URL . "/cross.png"; ?>' alt='delete icon' /></a></td><!-- Delete -->
522	<td>
523	<a class='wpsc_show_trackingid' title='<?php echo wpsc_the_purch_item_id(); ?>' href=''><?php echo wpsc_display_tracking_id(); ?></a>
524	</td>
	@@ -533,7 +441,7 @@ function wpsc_display_sales_logs() {
533	<input type='submit' name='submit' class='button' value='Add Tracking ID' />
534	</td>
535	<td colspan='4'>
536	- <a href='' title='<?php echo wpsc_the_purch_item_id(); ?>' class='sendTrackingEmail'>Send Custom Message</a>
537	</td>
538	</tr>
539
	@@ -545,7 +453,7 @@ function wpsc_display_sales_logs() {
545	<form action='' method='post'>
546	<input type='hidden' name='wpsc_admin_action' value='purchlogs_search' />
547	<input type='text' value='<?php if(isset($_POST['purchlogs_searchbox'])) echo $_POST['purchlogs_searchbox']; ?>' name='purchlogs_searchbox' id='purchlogs_searchbox' />
548	- <input type="submit" value="<?php _e('Search Logs'); ?>" class="button-secondary action" />
549	</form>
550	<?php
551	}
	@@ -609,7 +517,7 @@ function wpsc_purchlogs_notes() {
609	<input type="hidden" name="wpsc_purchlogs_update_notes_nonce" id="wpsc_purchlogs_update_notes_nonce" value="<?php echo wp_create_nonce( 'wpsc_purchlogs_update_notes' ); ?>" />
610	<input type='hidden' name='purchlog_id' value='<?php echo $_GET['purchaselog_id']; ?>' />
611	<p><textarea name="purchlog_notes" rows="3" wrap="virtual" id="purchlog_notes" style="width:100%;"><?php if ( isset($_POST['purchlog_notes']) ) { echo stripslashes($_POST['purchlog_notes']); } else { echo wpsc_display_purchlog_notes(); } ?></textarea></p>
612	- <p><input class="button" type="submit" name="button" id="button" value="Update Notes" /></p>
613	</form>
614	</div>
615	</div>


46	if(!isset($_REQUEST['purchaselog_id'])){
47	$columns = array(
48	'cb' => '<input type="checkbox" />',
49	+ 'purchid' => __( 'Order ID', 'wpsc' ),
50	+ 'date' => __( 'Date / Time', 'wpsc' ),
51	'name' => '',
52	+ 'amount' => __( 'Amount', 'wpsc' ),
53	+ 'details' => __( 'Details', 'wpsc' ),
54	+ 'status' => __( 'Status', 'wpsc' ),
55	+ 'delete' => __( 'Delete', 'wpsc' ),
56	+ 'track' => __( 'Tracking ID', 'wpsc' )
57	);
58	register_column_headers('display-sales-list', $columns);
59	///// start of update message section //////

62	if (isset($_GET['skipped']) \|\| isset($_GET['updated']) \|\| isset($_GET['deleted']) \|\| isset($_GET['locked']) ) { ?>
63	<div id="message" class="updated fade"><p>
64	<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
65	+ printf( _n( '%s Purchase Log updated.', '%s Purchase Logs updated.', $_GET['updated'], 'wpsc' ), absint( $_GET['updated'] ) );
66	unset($_GET['updated']);
67	}
68

70	unset($_GET['skipped']);
71
72	if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
73	+ printf( _n( '%s product not updated, somebody is editing it.', '%s products not updated, somebody is editing them.', $_GET['locked'], 'wpsc' ), absint( $_GET['locked'] ) );
74	unset($_GET['locked']);
75	}
76
77	if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
78	+ printf( _n( '%s Purchase Log deleted.', '%s Purchase Logs deleted.', $_GET['deleted'], 'wpsc' ), absint( $_GET['deleted'] ) );
79	unset($_GET['deleted']);
80	}
81	?>

83	<?php }
84
85	if(get_option('wpsc_purchaselogs_fixed')== false \|\| (wpsc_check_uniquenames()) ){ ?>
86	+ <div class='error' style='padding:8px;line-spacing:8px;'><span ><?php printf( __('When upgrading the WP e-Commerce Plugin from 3.6.* to 3.7 it is required that you associate your checkout form fields with the new Purchase Logs system. To do so please <a href="%s">Click Here</a>', 'wpsc'), $fixpage); ?></span></div>
87	<?php }
88	///// end of update message section //////?>
89	<div id='dashboard-widgets' style='min-width: 825px;'>

92	<div id='dashboard-widgets-main-content-wpsc' class='has-sidebar-content'>
93
94	<?php
95	+ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
96	+ do_meta_boxes('dashboard_page_wpsc-sales-logs', 'top', true);
97	+ ?>


98	</div><br />
99	<div id='wpsc_purchlog_searchbox'>
100	<?php wpsc_purchaselogs_searchbox(); ?>

102	<?php wpsc_purchaselogs_displaylist(); ?>
103
104	</div>
105	+ <script type="text/javascript">
106	+ jQuery(document).ready(function(){postboxes.add_postbox_toggles(pagenow);});
107	+ </script>
108	</div>
109	<?php }else{ //NOT IN GENERIC PURCHASE LOG PAGE, IN DETAILS PAGE PER PURCHASE LOG
110

115	<div id="message" class="updated fade"><p>
116	<?php
117	if ( isset($_GET['cleared']) && $_GET['cleared']==true ) {
118	+ _e('Downloads for this log have been released.', 'wpsc' );
119	unset($_GET['cleared']);
120	}
121	if ( isset($_GET['sent']) && (int) $_GET['sent'] ) {
122	+ _e( 'Receipt has been resent ', 'wpsc' );
123	unset($_GET['sent']);
124	}
125	?> </p></div>

267
268	<br /><br class='small' /><img src='<?php echo WPSC_CORE_IMAGES_URL; ?>/email_go.png' alt='email icon' />&ensp;<a href='<?php echo add_query_arg('email_buyer_id',$_GET['purchaselog_id']); ?>'><?php _e('Resend Receipt to Buyer', 'wpsc'); ?></a>
269
270	+ <br /><br class='small' /><a class='submitdelete' title='<?php echo esc_attr(__( 'Delete this log', 'wpsc' )); ?>' href='<?php echo wp_nonce_url("admin.php?wpsc_admin_action=delete_purchlog&purchlog_id=".$_GET['purchaselog_id'], 'delete_purchlog_' .$_GET['purchaselog_id']); ?>' onclick="if ( confirm(' <?php echo esc_js(sprintf( __("You are about to delete this log '%s'\n 'Cancel' to stop, 'OK' to delete.",'wpsc'), wpsc_purchaselog_details_date() )) ?>') ) { return true;}return false;"><img src='<?php echo WPSC_CORE_IMAGES_URL . "/cross.png"; ?>' alt='delete icon' />  <?php _e('Remove this record', 'wpsc') ?></a>
271
272	<br /><br class='small' />&emsp;&ensp; <a href='<?php echo $page_back ?>'><?php _e('Go Back', 'wpsc'); ?></a>
273	<br /><br />

279	<?php
280
281	}
282	+
































































































283	function wpsc_purchaselogs_displaylist(){
284	global $purchlogs;
285	?>
286	<form method='post' action=''>
287	<div class='wpsc_purchaselogs_options'>
288	<select id='purchlog_multiple_status_change' name='purchlog_multiple_status_change' class='purchlog_multiple_status_change'>
289	+ <option selected='selected' value='-1'><?php _e('Bulk Actions', 'wpsc'); ?></option>
290	<?php while(wpsc_have_purch_items_statuses()) : wpsc_the_purch_status(); ?>
291	<option value='<?php echo wpsc_the_purch_status_id(); ?>' >
292	<?php echo wpsc_the_purch_status_name(); ?>
293	</option>
294	<?php endwhile; ?>
295	+ <option value="delete"><?php _e('Delete', 'wpsc'); ?></option>
296	</select>
297	<input type='hidden' value='purchlog_bulk_modify' name='wpsc_admin_action2' />
298	+ <input type="submit" value="<?php _e('Apply', 'wpsc'); ?>" name="doaction" id="doaction" class="button-secondary action" />
299	<?php /* View functions for purchlogs */?>
300	<label for='view_purchlogs_by'><?php _e('View:'); ?></label>
301

318	}
319
320	?>
321	+ <option value='all' <?php echo $date_is_selected['all']; ?>><?php echo _x('All', 'all sales', 'wpsc'); ?></option>
322	+ <option value='3mnths' <?php echo $date_is_selected['3mnths']; ?>><?php _e('Three Months', 'wpsc'); ?></option>
323	<?php echo wpsc_purchlogs_getfirstdates(); ?>
324	</select>
325	<select id='view_purchlogs_by_status' name='view_purchlogs_by_status'>

343	}else{
344	$is_selected = '';
345	} ?>
346	+ <option <?php echo $is_selected; ?> value='-1'><?php _e('Status: All', 'wpsc'); ?></option>
347	</select>
348	<input type='hidden' value='purchlog_filter_by' name='wpsc_admin_action' />
349	+ <input type="submit" value="<?php _e('Filter', 'wpsc'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
350	</div>
351	<?php if( isset( $_POST['purchlogs_searchbox'] ) && wpsc_have_purch_items() == false ): ?>
352	+ <div class="updated settings-error"><p><?php _e('There are no purchase logs for your selection, please try again.', 'wpsc'); ?></p></div>
353	<?php endif;?>
354	<table class="widefat page fixed" cellspacing="0">
355	<thead>

366	<?php get_purchaselogs_content(); ?>
367	</tbody>
368	</table>
369	+ <p><strong><?php _e('Total:', 'wpsc'); ?></strong> <?php echo wpsc_currency_display( wpsc_the_purch_total() ); ?></p>
370	<?php
371	if(!isset($purchlogs->current_start_timestamp) && !isset($purchlogs->current_end_timestamp)){
372	$purchlogs->current_start_timestamp = $purchlogs->earliest_timestamp;

387	$(document).ready(function(){
388	$('#doaction, #doaction2').click(function(){
389	if ( $('select[name^="purchlog_multiple_status_change"]').val() == 'delete' ) {
390	+ var m = '<?php echo esc_js(__("You are about to delete the selected purchase logs.\n 'Cancel' to stop, 'OK' to delete.", "wpsc")); ?>';
391	return showNotice.warn(m);
392	}
393	});

411	<td><?php echo wpsc_the_purch_item_date(); ?></td> <!--Date -->
412	<td><?php echo wpsc_the_purch_item_name(); ?></td> <!--Name/email -->
413	<td><?php echo wpsc_currency_display( wpsc_the_purch_item_price() ); ?></td><!-- Amount -->
414	+ <td><a href='<?php echo htmlentities(add_query_arg('purchaselog_id', wpsc_the_purch_item_id()), ENT_QUOTES, 'UTF-8') ; ?>'><?php
415	+ $number_of_items = wpsc_the_purch_item_details();
416	+ printf( _n( '%s Item', '%s Items', $number_of_items, 'wpsc' ), $number_of_items );
417	+ ?></a></td><!-- Details -->
418	<td>
419	<?php if(!wpsc_purchlogs_is_google_checkout()){ ?>
420	<select class='selector' name='<?php echo wpsc_the_purch_item_id(); ?>' title='<?php echo wpsc_the_purch_item_id(); ?>' >

426	<a href='http://checkout.google.com/' rel=''><img class='google_checkout_logo' src='<?php echo WPSC_CORE_IMAGES_URL . "/checkout_logo.jpg"; ?>' alt='google checkout' /></a>
427	<?php } ?>
428	</td><!-- Status -->
429	+ <td><a class='submitdelete' title='<?php echo esc_attr(__('Delete this log', 'wpsc')); ?>' href='<?php echo wp_nonce_url("admin.php?wpsc_admin_action=delete_purchlog&purchlog_id=".wpsc_the_purch_item_id(), 'delete_purchlog_' . wpsc_the_purch_item_id()); ?>' onclick="if ( confirm(' <?php echo esc_js(sprintf( __("You are about to delete this log '%s'\n 'Cancel' to stop, 'OK' to delete.", 'wpsc'), wpsc_the_purch_item_date() )) ?>') ) { return true;}return false;"><img class='wpsc_pushdown_img' src='<?php echo WPSC_CORE_IMAGES_URL . "/cross.png"; ?>' alt='delete icon' /></a></td><!-- Delete -->
430	<td>
431	<a class='wpsc_show_trackingid' title='<?php echo wpsc_the_purch_item_id(); ?>' href=''><?php echo wpsc_display_tracking_id(); ?></a>
432	</td>

441	<input type='submit' name='submit' class='button' value='Add Tracking ID' />
442	</td>
443	<td colspan='4'>
444	+ <a href='' title='<?php echo wpsc_the_purch_item_id(); ?>' class='sendTrackingEmail'><?php _e( 'Send Custom Message', 'wpsc' ); ?></a>
445	</td>
446	</tr>
447

453	<form action='' method='post'>
454	<input type='hidden' name='wpsc_admin_action' value='purchlogs_search' />
455	<input type='text' value='<?php if(isset($_POST['purchlogs_searchbox'])) echo $_POST['purchlogs_searchbox']; ?>' name='purchlogs_searchbox' id='purchlogs_searchbox' />
456	+ <input type="submit" value="<?php _e('Search Logs', 'wpsc'); ?>" class="button-secondary action" />
457	</form>
458	<?php
459	}

517	<input type="hidden" name="wpsc_purchlogs_update_notes_nonce" id="wpsc_purchlogs_update_notes_nonce" value="<?php echo wp_create_nonce( 'wpsc_purchlogs_update_notes' ); ?>" />
518	<input type='hidden' name='purchlog_id' value='<?php echo $_GET['purchaselog_id']; ?>' />
519	<p><textarea name="purchlog_notes" rows="3" wrap="virtual" id="purchlog_notes" style="width:100%;"><?php if ( isset($_POST['purchlog_notes']) ) { echo stripslashes($_POST['purchlog_notes']); } else { echo wpsc_display_purchlog_notes(); } ?></textarea></p>
520	+ <p><input class="button" type="submit" name="button" id="button" value="<?php _e( 'Update Notes', 'wpsc' ); ?>" /></p>
521	</form>
522	</div>
523	</div>

wpsc-admin/display-update.page.php CHANGED Viewed

	@@ -37,7 +37,7 @@ if ( get_option( 'wpsc_version' ) < 3.8 \|\| !get_option( 'wpsc_version' ) ) {
37	if ( $product_count > 0 ) {
38
39	function wpsc_display_update_notice() {
40	- echo "<div id='wpsc-warning' class='error fade'><p><strong>" . __( 'WP e-Commerce is almost ready.' ) . "</strong> " . sprintf( __( 'You must <a href="%1$s">update your database</a> to import all of your products.' ), "admin.php?page=wpsc-update") . "</p></div>";
41	}
42
43	if ( isset( $_GET['page'] ) && $_GET['page'] != 'wpsc-update' )


37	if ( $product_count > 0 ) {
38
39	function wpsc_display_update_notice() {
40	+ echo "<div id='wpsc-warning' class='error fade'><p><strong>" . __( 'WP e-Commerce is almost ready.', 'wpsc' ) . "</strong> " . sprintf( __( 'You must <a href="%1$s">update your database</a> to import all of your products.', 'wpsc' ), "admin.php?page=wpsc-update") . "</p></div>";
41	}
42
43	if ( isset( $_GET['page'] ) && $_GET['page'] != 'wpsc-update' )

wpsc-admin/display-upgrades.page.php CHANGED Viewed

	@@ -85,11 +85,11 @@ function wpsc_display_upgrades_page() {
85	<div class='postbox'>
86	<h3 class='hndle'><?php _e( 'API Key Reset', 'wpsc' ); ?></h3>
87	<p>
88	- <label for='activation_name'><?php _e( 'Name', 'wpsc' ); ~~?>:</~~label>
89	<input class='text' type='text' size='40' value='<?php echo get_option( 'activation_name' ); ?>' name='activation_name' id='activation_name' />
90	</p>
91	<p>
92	- <label for='activation_key'><?php _e( 'API Key', 'wpsc' ); ~~?>:</~~label>
93	<input class='text' type='text' size='40' value='<?php echo get_option( 'activation_key' ); ?>' name='activation_key' id='activation_key' />
94	</p>
95	<p>


85	<div class='postbox'>
86	<h3 class='hndle'><?php _e( 'API Key Reset', 'wpsc' ); ?></h3>
87	<p>
88	+ <label for='activation_name'><?php _e( 'Name:', 'wpsc' ); ?></label>
89	<input class='text' type='text' size='40' value='<?php echo get_option( 'activation_name' ); ?>' name='activation_name' id='activation_name' />
90	</p>
91	<p>
92	+ <label for='activation_key'><?php _e( 'API Key:', 'wpsc' ); ?></label>
93	<input class='text' type='text' size='40' value='<?php echo get_option( 'activation_key' ); ?>' name='activation_key' id='activation_key' />
94	</p>
95	<p>

wpsc-admin/display-variations.page.php DELETED Viewed

@@ -1,241 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * WP eCommerce edit and add variation group page functions
-            -
             *
-            -
             * These are the main WPSC Admin functions
-            -
             *
-            -
             * @package wp-e-commerce
-            -
             * @since 3.7
-            -
             */
-            -
-            -
            function wpsc_display_variations_page() {
-            -
            	$columns = array(
-            -
            		'title' => __('Name', 'wpsc'),
-            -
            		'edit' => __('Edit', 'wpsc')
-            -
            	);
-            -
            	register_column_headers('display-variations-list', $columns);
-            -
-            -
            	?>
-            -
            	<script language='javascript' type='text/javascript'>
-            -
            		function conf() {
-            -
            			var check = confirm("<?php _e('Are you sure you want to delete this product?', 'wpsc');?>");
-            -
            			if(check) {
-            -
            				return true;
-            -
            			} else {
-            -
            				return false;
-            -
            			}
-            -
            		}
-            -
-            -
            		<?php
-            -
-            -
            		?>
-            -
            	</script><noscript>
-            -
            	</noscript>
-            -
-            -
            	<div class="wrap">
-            -
            		<h2><?php echo esc_html( __('Display Variations', 'wpsc') ); ?> </h2>
-            -
            		<p>
-            -
            				<?php _e('A variation can be anything "optional" about a product. ie: Size, Color, etc <br />For example: if you are selling t-shirts you might setup a variation set called size with the values small, medium, large...', 'wpsc');?>
-            -
            		</p>
-            -
-            -
-            -
            		<?php if (isset($_GET['deleted']) || isset($_GET['message'])) { ?>
-            -
            			<div id="message" class="updated fade">
-            -
            				<p>
-            -
            				<?php
-            -
            				if (isset($_GET['message']) ) {
-            -
            					$message = absint( $_GET['message'] );
-            -
            					$messages[1] =  __( 'Product updated.', 'wpsc');
-            -
            					echo $messages[$message];
-            -
            					unset($_GET['message']);
-            -
            				}
-            -
-            -
            				$_SERVER['REQUEST_URI'] = remove_query_arg( array('deleted', 'message'), $_SERVER['REQUEST_URI'] );
-            -
            				?>
-            -
            			</p>
-            -
            		</div>
-            -
            		<?php } ?>
-            -
-            -
            		<div id="col-container" class=''>
-            -
            			<div id="col-right">
-            -
            				<div id='poststuff' class="col-wrap">
-            -
            					<form id="modify-variation-groups" method="post" action="" enctype="multipart/form-data" >
-            -
            					<?php
-            -
            						wpsc_admin_variation_forms($_GET['variation_id']);
-            -
            					?>
-            -
            					</form>
-            -
            				</div>
-            -
            			</div>
-            -
-            -
            			<div id="col-left">
-            -
            				<div class="col-wrap">
-            -
            					<?php
-            -
            						wpsc_admin_variation_group_list($category_id);
-            -
            					?>
-            -
            				</div>
-            -
            			</div>
-            -
            		</div>
-            -
-            -
-            -
            	</div>
-            -
            	<?php
-            -
            }
-            -
-            -
-            -
            /*
-            -
             * wpsc_admin_variation_group_list, prints the left hand side of the edit variations page
-            -
             * no parameters
-            -
             * nothing returned
-            -
             */
-            -
-            -
            function wpsc_admin_variation_group_list() {
-            -
              global $wpdb;
-            -
            	?>
-            -
            		<table class="widefat page" id='wpsc_variation_list' cellspacing="0">
-            -
            			<thead>
-            -
            				<tr>
-            -
            					<?php print_column_headers('display-variations-list'); ?>
-            -
            				</tr>
-            -
            			</thead>
-            -
-            -
            			<tfoot>
-            -
            				<tr>
-            -
            					<?php print_column_headers('display-variations-list', false); ?>
-            -
            				</tr>
-            -
            			</tfoot>
-            -
-            -
            			<tbody>
-            -
            				<?php
-            -
            				$variations = get_terms('wpsc-variation', array(
-            -
            					'hide_empty'=> 0,
-            -
            					'parent' => 0
-            -
            				));
-            -
            				foreach((array)$variations as $variation) {
-            -
            					?>
-            -
            						<tr class="variation-edit" id="variation-<?php echo $variation->term_id; ?>">
-            -
            								<td class="variation-name"><?php echo htmlentities($variation->name, ENT_QUOTES, 'UTF-8'); ?></td>
-            -
            								<td class="edit-variation">
-            -
            								<a href='<?php echo add_query_arg('variation_id', $variation->term_id); ?>'><?php _e('Edit', 'wpsc'); ?></a>
-            -
            								</td>
-            -
            						</tr>
-            -
            					<?php
-            -
            				}
-            -
            				?>
-            -
            			</tbody>
-            -
            		</table>
-            -
            		<?php
-            -
            }
-            -
-            -
-            -
            /*
-            -
             * wpsc_admin_variation_group_list, prints the right hand side of the edit variations page
-            -
             * @param int $variation_id the variation ID
-            -
             * nothing returned
-            -
             */
-            -
            function wpsc_admin_variation_forms($variation_id =  null) {
-            -
            	global $wpdb;
-            -
            	$variation_value_count = 0;
-            -
            	$variation_name = '';
-            -
            	if($variation_id > 0 ) {
-            -
            		$variation_id = absint($variation_id);
-            -
            		$variation_set = get_term($variation_id, 'wpsc-variation', ARRAY_A);
-            -
            		$variations = get_terms('wpsc-variation', array(
-            -
            			'hide_empty' => 0,
-            -
            			'parent' => $variation_id
-            -
            		));
-            -
            		$variation_count = count($variations);
-            -
            	}
-            -
            	if(($_GET['valuecount'] > 0)) {
-            -
            		$value_form_count = absint($_GET['valuecount']);
-            -
            	} else {
-            -
            		$value_form_count = 3;
-            -
            		remove_query_arg( array('valuecount'), $_SERVER['REQUEST_URI'] );
-            -
            	}
-            -
            	if($variation_name != '') {
-            -
            		?>
-            -
            		<h3><?php _e('Edit Variation Set', 'wpsc'); ?><span> (<a href="admin.php?page=wpsc-edit-variations"><?php _e('Add new Variation Set', 'wpsc'); ?></a>)</span></h3>
-            -
            		<?php
-            -
            	} else {
-            -
            		?>
-            -
            		<h3><?php _e('Add Variation Set', 'wpsc'); ?></h3>
-            -
            		<?php
-            -
            	}
-            -
            	?>
-            -
            	<table class='category_forms'>
-            -
            		<tr>
-            -
            			<td>
-            -
            				<?php _e('Name', 'wpsc'); ?>:
-            -
            			</td>
-            -
            			<td>
-            -
            				<input type='text'  class="text" name='name' value='<?php echo $variation_set['name']; ?>' />
-            -
            			</td>
-            -
            		</tr>
-            -
            		<tr>
-            -
            			<td>
-            -
            				<?php _e('Variation Values', 'wpsc'); ?>:
-            -
            			</td>
-            -
            			<td>
-            -
            				<div id='variation_values'>
-            -
            					<?php
-            -
            						if($variation_count > 0) {
-            -
            							$num = 0;
-            -
            							foreach($variations as $variation) {
-            -
            								$delete_url = wp_nonce_url("admin.php?wpsc_admin_action=wpsc-variation-set&amp;delete_value=true&amp;variation_id={$variation_id}&amp;value_id={$variation->term_id}", "delete-variation-{$variation->term_id}");
-            -
            								?>
-            -
            								<div class='variation_value' id='variation_row_<?php echo $variation->term_id; ?>'>
-            -
            								<a class='variation_handle' href="#">&equiv;</a>
-            -
            								<input type='text' class='text' name='variation_values[<?php echo $variation->term_id; ?>]' value='<?php echo htmlentities($variation->name, ENT_QUOTES, 'UTF-8'); ?>' />
-            -
            								<input type='hidden' class='variation_values_id' name='variation_values_id[]' value='<?php echo $variation->term_id; ?>' />
-            -
            								<?php if($variation_count > 1): ?>
-            -
            									<a class='image_link delete_variation_value' href='<?php echo $delete_url; ?>' >
-            -
            									  <img src='<?php echo WPSC_CORE_IMAGES_URL; ?>/trash.gif' alt='<?php _e('Delete', 'wpsc'); ?>' title='<?php _e('Delete', 'wpsc'); ?>' />
-            -
            									</a>
-            -
            								<?php endif; ?>
-            -
            								</div>
-            -
            								<?php
-            -
            								$num++;
-            -
            							}
-            -
            						} else {
-            -
            							for($i = 0; $i <= $value_form_count; $i++) {
-            -
            								?>
-            -
            								<div class='variation_value'>
-            -
            									<input type='text' class="text" name='new_variation_values[]' value='' />
-            -
            										<a class='image_link delete_variation_value' href='#'>
-            -
            											<img src='<?php echo WPSC_CORE_IMAGES_URL; ?>/trash.gif' alt='<?php _e('Delete', 'wpsc'); ?>' title='<?php _e('Delete', 'wpsc'); ?>' />
-            -
            										</a>
-            -
            								</div>
-            -
            								<?php
-            -
            							}
-            -
            					}
-            -
            				?>
-            -
            				</div>
-            -
            				<a href='#' class='add_variation_item_form'>+ <?php _e('Add Value'); ?></a>
-            -
            			</td>
-            -
            		</tr>
-            -
            		<tr>
-            -
            			<td>
-            -
            			</td>
-            -
            			<td>
-            -
            				<?php wp_nonce_field('edit-variation', 'wpsc-edit-variation'); ?>
-            -
            		        <input type='hidden' name='wpsc_admin_action' value='wpsc-variation-set' />
-            -
-            -
            				<?php if($variation_id > 0) { ?>
-            -
            					<?php
-            -
            					$nonced_url = wp_nonce_url("admin.php?wpsc_admin_action=wpsc-delete-variation-set&amp;deleteid={$variation_id}", 'delete-variation');
-            -
            					?>
-            -
            					<input type='hidden' name='variation_id' value='<?php echo $variation_id; ?>' />
-            -
            					<input type='hidden' name='submit_action' value='edit' />
-            -
            					<input class='button' style='float:left;'  type='submit' name='submit' value='<?php _e('Edit', 'wpsc'); ?>' />
-            -
            					<a class='button delete_button' href='<?php echo $nonced_url; ?>' onclick="return conf();" ><?php _e('Delete', 'wpsc'); ?></a>
-            -
            				<?php } else { ?>
-            -
            					<input type='hidden' name='submit_action' value='add' />
-            -
            					<input class='button'  type='submit' name='submit' value='<?php _e('Add', 'wpsc');?>' />
-            -
            				<?php } ?>
-            -
            			</td>
-            -
            		</tr>
-            -
            	</table>
-            -
              <?php
-            -
            }
-            -
-            -
-            -
            ?>

wpsc-admin/includes/display-items-functions.php CHANGED Viewed

	@@ -59,7 +59,7 @@ add_action( 'admin_head', 'wpsc_css_header' );
59
60	function wpsc_redirect_variation_update( $location, $post_id ) {
61	global $post;
62	- if ( $post->post_parent > 0 )
63	wp_redirect( admin_url( 'post.php?post='.$post->post_parent.'&action=edit' ) );
64	else
65	return $location;
	@@ -71,7 +71,7 @@ function wpsc_css_header() {
71	global $post_type;
72	?>
73	<style>
74	- <?php if ( ( $_GET['post_type'] == 'wpsc-product' ) \|\| ( $post_type == 'wpsc-product' ) ) : ?>
75	#icon-edit { background:transparent url('<?php echo WPSC_CORE_IMAGES_URL.'/icon32.png';?>') no-repeat; }
76	<?php endif; ?>
77	</style>
	@@ -85,7 +85,10 @@ function wpsc_price_control_forms() {
85	foreach ( $product_data['meta'] as $meta_key => $meta_value )
86	$product_data['meta'][$meta_key] = $meta_value[0];
87
88	- $product_meta = ~~maybe_unserialize~~( ~~$product_data["_wpsc_product_metadata"][0]~~ );



89	if ( isset( $product_data['meta']['_wpsc_currency'] ) )
90	$product_alt_currency = maybe_unserialize( $product_data['meta']['_wpsc_currency'] );
91
	@@ -132,13 +135,13 @@ function wpsc_price_control_forms() {
132
133	<div class='wpsc_floatleft' style="width:85px;">
134	<label><?php _e( 'Price', 'wpsc' ); ?>:</label><br />
135	- <input type='text' class='text' size='10' name='meta[_wpsc_price]' value='<?php echo number_format( $product_data['meta']['_wpsc_price'], 2, '.', '' ); ?>' />
136	</div>
137	<div class='wpsc_floatleft' style='display:<?php if ( ( $product_data['special'] == 1 ) ? 'block' : 'none'
138	); ?>; width:85px; margin-left:30px;'>
139	<label for='add_form_special'><?php _e( 'Sale Price', 'wpsc' ); ?>:</label>
140	<div id='add_special'>
141	- <input type='text' size='10' value='<?php echo number_format( $product_data['meta']['_wpsc_special_price'], 2, '.', '' ); ?>' name='meta[_wpsc_special_price]' />
142	</div>
143	</div>
144	<br style="clear:both" />
	@@ -186,9 +189,9 @@ function wpsc_price_control_forms() {
186	endif;
187
188	echo "<br style='clear:both' />
189	- <br/><input id='add_form_donation' type='checkbox' name='meta[_wpsc_is_donation]' value='yes' " . ( ( $product_data['meta']['_wpsc_is_donation'] == 1 ) ? 'checked="checked"' : '' ) . " /> <label for='add_form_donation'>" . __( 'This is a donation, checking this box populates the donations widget.', 'wpsc' ) . "</label>";
190	?>
191	- <br /><br /> <input type='checkbox' value='1' name='table_rate_price[state]' id='table_rate_price' <?php echo ( ( (bool)$product_meta['table_rate_price']['state'] == true ) ? 'checked=\'checked\'' : '' ); ?> />
192	<label for='table_rate_price'><?php _e( 'Table Rate Price', 'wpsc' ); ?></label>
193	<div id='table_rate'>
194	<a class='add_level' style='cursor:pointer;'><?php _e( '+ Add level', 'wpsc' ); ?></a><br />
	@@ -236,7 +239,9 @@ function wpsc_stock_control_forms() {
236	foreach ( $product_data['meta'] as $meta_key => $meta_value )
237	$product_data['meta'][$meta_key] = $meta_value[0];
238
239	- $product_meta = ~~maybe_unserialize~~( ~~$product_data["_wpsc_product_metadata"][0]~~ );


240
241	if ( !isset( $product_meta['unpublish_when_none_left'] ) )
242	$product_meta['unpublish_when_none_left'] = ''; ?>
	@@ -262,16 +267,26 @@ function wpsc_stock_control_forms() {
262	<?php if ( wpsc_product_has_children( $post->ID ) ) : ?>
263	<?php $stock = wpsc_variations_stock_remaining( $post->ID ); ?>
264	<p><?php _e( 'This Product has variations, to edit the quantity please use the Variation Controls below.' , 'wpsc' ); ?></p>
265	- <p><?php printf( _n( "%s variant item in stock.", "%s variant items in stock.", $stock ), $stock ); ?></p>
266	<?php else: ?>
267	<label for="stock_limit_quantity"><?php _e( 'Quantity:', 'wpsc' ); ?></label>
268	<input type='text' id="stock_limit_quantity" name='meta[_wpsc_stock]' size='3' value='<?php echo $product_data['meta']['_wpsc_stock']; ?>' class='stock_limit_quantity' />










269	<?php endif; ?>
270	<div class='unpublish_when_none_left'>
271	<input type='checkbox' id="inform_when_oos" name='meta[_wpsc_product_metadata][unpublish_when_none_left]' class='inform_when_oos'<?php if ( $product_meta['unpublish_when_none_left'] == 1 ) echo ' checked="checked"'; ?> />
272	<label for="inform_when_oos"><?php _e( 'Notify site owner and unpublish this Product if stock runs out', 'wpsc' ); ?></label>
273	</div>
274	- <?php _e( 'If stock runs out, this Product will not be available on the shop unless you untick this box or add more stock.', 'wpsc' ); ?>
275	</div> <?php
276	} else { ?>
277	<div style='display: none;' class='edit_stock'>
	@@ -288,7 +303,9 @@ function wpsc_product_taxes_forms() {
288	global $post, $wpdb, $wpsc_product_defaults;
289	$product_data = get_post_custom( $post->ID );
290
291	- $product_data['meta'] = $product_meta = ~~maybe_unserialize~~( ~~$product_data['_wpsc_product_metadata'][0]~~ );


292
293	if ( !isset( $product_data['meta']['_wpsc_custom_tax'] ) )
294	$product_data['meta']['_wpsc_custom_tax'] = '';
	@@ -359,7 +376,9 @@ function wpsc_product_variation_forms() {
359	foreach ( $product_data['meta'] as $meta_key => $meta_value )
360	$product_data['meta'][$meta_key] = $meta_value[0];
361
362	- $product_meta = ~~maybe_unserialize~~( ~~$product_data["_wpsc_product_metadata"][0]~~ );


363
364	$siteurl = get_option( 'siteurl' );
365	$output = '';
	@@ -502,21 +521,52 @@ function wpsc_product_shipping_forms() {
502	foreach ( $product_data['meta'] as $meta_key => $meta_value )
503	$product_data['meta'][$meta_key] = $meta_value[0];
504
505	- $product_meta = ~~maybe_unserialize~~( ~~$product_data["_wpsc_product_metadata"][0]~~ );


506
507	$product_data['transformed'] = array();
508	if ( !isset( $product_meta['weight'] ) )
509	$product_meta['weight'] = "";
















510
511	- ~~$product_data['transformed']['weight']~~ ~~= wpsc_convert_weight~~( $product_meta['~~weight~~']~~, "pound", $product_meta~~['~~weight_unit~~'] );

512
513	- ?>












514	<table>
515
516	<!--USPS shipping changes-->
517	<tr>
518	<td>
519	- <?php _e( 'Weight', 'wpsc' )?>
520	</td>
521	<td>
522	<input type='text' size='5' name='meta[_wpsc_product_metadata][weight]' value='<?php echo $product_data['transformed']['weight']; ?>' />
	@@ -534,7 +584,7 @@ function wpsc_product_shipping_forms() {
534	<?php _e( 'Height', 'wpsc' ); ?>
535	</td>
536	<td>
537	- <input type='text' size='5' name='meta[_wpsc_product_metadata][dimensions][height]' value= '<?php echo $product_meta['dimensions']['height']; ?>'>
538	<select name='meta[_wpsc_product_metadata][dimensions][height_unit]'>
539	<option value='in' <?php echo ( ( $product_meta['dimensions']['height_unit'] == 'in' ) ? 'selected' : '' ); ?> ><?php _e( 'inches', 'wpsc' ); ?></option>
540	<option value='cm' <?php echo ( ( $product_meta['dimensions']['height_unit'] == 'cm' ) ? 'selected' : '' ); ?> ><?php _e( 'cm', 'wpsc' ); ?></option>
	@@ -581,7 +631,7 @@ function wpsc_product_shipping_forms() {
581	<?php _e( 'Local Shipping Fee', 'wpsc' ); ?>
582	</td>
583	<td>
584	- <input type='text' size='10' name='meta[_wpsc_product_metadata][shipping][local]' value='<?php echo number_format( $product_meta['shipping']['local'], 2, '.', '' ); ?>' />
585	</td>
586	</tr>
587
	@@ -590,7 +640,7 @@ function wpsc_product_shipping_forms() {
590	<?php _e( 'International Shipping Fee', 'wpsc' ); ?>
591	</td>
592	<td>
593	- <input type='text' size='10' name='meta[_wpsc_product_metadata][shipping][international]' value='<?php echo number_format( $product_meta['shipping']['international'], 2, '.', '' ); ?>' />
594	</td>
595	</tr>
596	<tr>
	@@ -606,7 +656,9 @@ function wpsc_product_advanced_forms() {
606	global $post, $wpdb, $variations_processor, $wpsc_product_defaults;
607	$product_data = get_post_custom( $post->ID );
608
609	- $product_data['meta'] = $product_meta = ~~maybe_unserialize~~( ~~$product_data['_wpsc_product_metadata'][0]~~ );


610
611	$custom_fields = $wpdb->get_results( "
612	SELECT
	@@ -620,6 +672,12 @@ function wpsc_product_advanced_forms() {
620	ORDER BY
621	LOWER(meta_key)", ARRAY_A
622	);






623	?>
624
625	<table>
	@@ -654,7 +712,7 @@ function wpsc_product_advanced_forms() {
654	</td>
655	</tr>
656	<tr>
657	- <td class='itemfirstcol' colspan='2'><br /> <strong><?php _e( 'Merchant Notes', 'wpsc' ); ~~?>:</~~strong><br />
658
659	<textarea cols='40' rows='3' name='meta[_wpsc_product_metadata][merchant_notes]' id='merchant_notes'>
660	<?php if ( isset( $product_meta['merchant_notes'] ) )
	@@ -688,8 +746,8 @@ function wpsc_product_advanced_forms() {
688	<td class='itemfirstcol' colspan='2'>
689
690	<input type='checkbox' <?php echo $product_meta['google_prohibited']; ?> name='meta[_wpsc_product_metadata][google_prohibited]' id='add_google_prohibited' /> <label for='add_google_prohibited'>
691	- <?php _e( 'Prohibited', 'wpsc' ); ?>
692	- ~~<a href='http://checkout.google.com/support/sell/bin/answer.py?answer=75724'>by Google?</a></~~label><br />
693	</td>
694	</tr>
695	<?php
	@@ -718,7 +776,9 @@ function wpsc_product_external_link_forms() {
718	global $post, $wpdb, $variations_processor, $wpsc_product_defaults;
719	$product_data = get_post_custom( $post->ID );
720
721	- $product_data['meta'] = $product_meta = ~~maybe_unserialize~~( ~~$product_data['_wpsc_product_metadata'][0]~~ );


722
723	// Get External Link Values
724	$external_link_value = isset( $product_meta['external_link'] ) ? $product_meta['external_link'] : '';
	@@ -734,19 +794,19 @@ function wpsc_product_external_link_forms() {
734	<tbody>
735	<tr class="form-field">
736	<th valign="top" scope="row"><label for="external_link"><?php _e( 'External Link', 'wpsc' ); ?></label></th>
737	- <td><input type="text" name="meta[_wpsc_product_metadata][external_link]" id="external_link" value="<?php ~~echo~~ $external_link_value; ?>" size="50" style="width: 95%"></td>
738	</tr>
739	<tr class="form-field">
740	<th valign="top" scope="row"><label for="external_link_text"><?php _e( 'External Link Text', 'wpsc' ); ?></label></th>
741	- <td><input type="text" name="meta[_wpsc_product_metadata][external_link_text]" id="external_link_text" value="<?php ~~echo~~ $external_link_text_value; ?>" size="50" style="width: 95%"></td>
742	</tr>
743	<tr class="form-field">
744	<th valign="top" scope="row"><label for="external_link_target"><?php _e( 'External Link Target', 'wpsc' ); ?></label></th>
745	<td>
746	<select id="external_link_target" name="meta[_wpsc_product_metadata][external_link_target]">
747	<option value=""><?php _ex( 'Default (set by theme)', 'External product link target', 'wpsc' ); ?></option>
748	- <option value="_self" <?php echo $external_link_target_value_selected['_self']; ?>><?php _e( 'Open link in the same window', 'wpsc' ); ?></option>
749	- <option value="_blank" <?php echo $external_link_target_value_selected['_blank']; ?>><?php _e( 'Open link in a new window', 'wpsc' ); ?></option>
750	</select>
751	</td>
752	</tr>
	@@ -773,11 +833,12 @@ function wpsc_additional_desc() {
773
774	}
775	function wpsc_product_download_forms() {
776	-
777	global $post, $wpdb, $wpsc_product_defaults;
778	$product_data = get_post_custom( $post->ID );
779	-
780	- $product_data['meta'] = $product_meta = ~~maybe_unserialize~~( ~~$product_data['_wpsc_product_metadata'][0]~~ );


781
782	$upload_max = wpsc_get_max_upload_size();
783	?>
	@@ -791,69 +852,32 @@ function wpsc_product_download_forms() {
791	<br />
792	<h4><?php _e( "Select an MP3 file to upload as a preview", 'wpsc' ) ?></h4>
793	<input type='file' name='preview_file' value='' /><br />


















794	<br />
795	<?php
796	}
797	$output = apply_filters( 'wpsc_downloads_metabox', $output );
798	}
799	function wpsc_product_label_forms() {
800	- ~~//This~~ is ~~new~~ ~~to me...not sure why this is even here~~
801	- ?>
802	- <div id='wpsc_product_label_forms' class='postbox <?php echo ( ( array_search( 'wpsc_product_label_forms', $product_data['closed_postboxes'] ) !== false ) ? 'closed' : '' ); ?>'><div class="handlediv" title="<?php _e( 'Click to toggle', 'wpsc' ); ?>"><br></div>
803	- <h3 class="<?php if ( function_exists( 'add_object_page' ) ) : ?>hndle<?php endif; ?>">
804	- <?php if ( !function_exists( 'add_object_page' ) ) : ?>
805	-
806	- <a class='togbox'>+</a>
807	-
808	- <?php endif; ?>
809	-
810	- <?php _e( 'Label Control', 'wpsc' ); ?>
811	- </h3>
812	- <div class='inside'>
813	- <table>
814	- <tr>
815	- <td colspan='2'>
816	- <?php _e( 'Add Label', 'wpsc' ); ?> :
817	- <a id='add_label'><?php _e( 'Add Label', 'wpsc' ); ?></a>
818	- </td>
819	- </tr>
820	- <tr>
821	- <td colspan='2'>
822	- <div id="labels">
823	- <table>
824	- <tr>
825	- <td><?php _e( 'Label', 'wpsc' ) ?> :</td>
826	- <td><input type="text" name="productmeta_values[labels][]"></td>
827	- </tr>
828	- <tr>
829	- <td><?php _e( 'Label Description', 'wpsc' ) ?> :</td>
830	- <td><textarea name="productmeta_values[labels_desc][]"></textarea></td>
831	- </tr>
832	- <tr>
833	- <td><?php _e( 'Life Number', 'wpsc' ) ?> :</td>
834	- <td><input type="text" name="productmeta_values[life_number][]"></td>
835	- </tr>
836	- <tr>
837	- <td><?php _e( 'Item Number', 'wpsc' ) ?> :</td>
838	- <td><input type="text" name="productmeta_values[item_number][]"></td>
839	- </tr>
840	- <tr>
841	- <td><?php _e( 'Product Code', 'wpsc' ) ?> :</td>
842	- <td><input type="text" name="productmeta_values[product_code][]"></td>
843	- </tr>
844	- <tr>
845	- <td><?php _e( 'PDF', 'wpsc' ) ?> :</td>
846	- <td><input type="file" name="pdf[]"></td>
847	- </tr>
848	- </table>
849	- </div>
850	- </td>
851	- </tr>
852	- </table>
853	- </div>
854	- </div>
855	-
856	- <?php
857	}
858	/**
859	* Adding function to change text for media buttons
	@@ -896,11 +920,32 @@ if ( ( isset( $_REQUEST['parent_page'] ) && ( $_REQUEST['parent_page'] == 'wpsc-
896	add_filter( 'gettext', 'wpsc_filter_delete_text', 12 , 3 );
897	add_filter( 'attachment_fields_to_edit', 'wpsc_attachment_fields', 11, 2 );
898	add_filter( 'gettext', 'wpsc_filter_feature_image_text', 12, 3 );

899
900	if ( isset( $_REQUEST["save"] ) && isset( $_REQUEST["attachments"] ) && is_array( $_REQUEST["attachments"] ) ) {
901	//wpsc_regenerate_thumbnails();
902	}
903




















904	/*
905	* This filter translates string before it is displayed
906	* specifically for the words 'Use as featured image' with 'Use as Product Thumbnail' when the user is selecting a Product Thumbnail
	@@ -917,33 +962,46 @@ function wpsc_filter_feature_image_text( $translation, $text, $domain ) {
917	$post = get_post( $_REQUEST['post_id'] );
918	if ( $post->post_type != 'wpsc-product' ) return $translation;
919	$translations = &get_translations_for_domain( $domain );
920	- return $translations->translate( 'Use as Product Thumbnail', 'wpsc' ) ;


921	}







922	return $translation;
923	}
924	function wpsc_attachment_fields( $form_fields, $post ) {





925
926	- ~~$parent_post~~ ~~= get_post~~( $~~post~~->~~post_parent~~ );
927	-
928	- if ( $parent_post->post_type == "wpsc-product" \|\| $parent_post->post_title == "stopgap" ) {
929
930	//Unfortunate hack, as I'm not sure why the From Computer tab doesn't process filters the same way the Gallery does
931
932	echo '
933	<script type="text/javascript">
934
935	- jQuery(function($){
936	-
937	- var product_image = $("a.wp-post-thumbnail").text();
938
939	- if (~~product_image ==~~ "~~Use as featured image~~") {
940	- $(~~"a.wp-post-thumbnail"~~).text(~~"Use as Product Thumbnail"~~);
941	- }



942
943	- var trash = $("#media-upload a.del-link").text();
944
945	if (trash == "Delete") {
946	- $("#media-upload a.del-link").text("Trash");
947	}
948
949
	@@ -999,7 +1057,7 @@ function wpsc_attachment_fields( $form_fields, $post ) {
999	$form_fields["wpsc_custom_thumb"] = array(
1000	"label" => __( "Products Page Thumbnail Size:", 'wpsc' ),
1001	"input" => "html", // this is default if "input" is omitted
1002	- "helps" => "<span style='text-align:left; clear:both; display:block; padding-top:3px;'>Custom thumbnail size for this image on the main Product Page</span>",
1003	"html" => $custom_thumb_html
1004	);
1005
	@@ -1048,29 +1106,20 @@ function wpsc_gallery_css_mods() {
1048	</style>';
1049	print '
1050	<script type="text/javascript">


1051
1052	- jQuery(~~function~~($){
1053	- $("td.~~A1B1~~").~~each~~(~~function(~~){
1054	-
1055	- var target = $(this).next();
1056	- $("p > input.button", this).appendTo(target);
1057
1058	});
1059
1060	- ~~var title = $~~("~~div~~.~~media~~-~~item span.title~~").~~text~~();
1061	-
1062	- if(~~title~~ == "~~stopgap~~") {
1063	- $(~~"div~~.~~media-item~~").~~hide~~();
1064	- }
1065	-
1066	- var product_image = $("a.wp-post-thumbnail").text();
1067	-
1068	- if (product_image == "Use as featured image") {
1069	- $("a.wp-post-thumbnail").text("Use as Product Thumbnail");
1070	- }
1071	-
1072	-
1073	-
1074	});
1075
1076	</script>';
	@@ -1131,15 +1180,16 @@ function edit_multiple_image_gallery( $post ) {
1131	*/
1132
1133	function wpsc_save_quickedit_box( $post_id ) {
1134	-
1135	- if ( !defined( '~~DOING_AJAX~~' ) )
1136	return;
1137
1138	$is_parent = ( bool )wpsc_product_has_children( $post_id );
1139	$product_meta = get_post_meta( $post_id, '_wpsc_product_metadata', true );
1140	- $weight_unit = $product_meta["weight_unit"];
1141	- $weight = wpsc_convert_weight( $_POST["weight"], $weight_unit, "pound" );
1142



1143	if ( isset( $product_meta["weight"] ) )
1144	unset( $product_meta["weight"] );
1145
	@@ -1147,11 +1197,17 @@ function wpsc_save_quickedit_box( $post_id ) {
1147
1148	if ( !$is_parent ) {
1149	update_post_meta( $post_id, '_wpsc_product_metadata', $product_meta );
1150	- ~~update_post_meta~~( $~~post_id, '_wpsc_stock', $~~_POST['stock'] );



1151	update_post_meta( $post_id, '_wpsc_price', $_POST['price'] );
1152	update_post_meta( $post_id, '_wpsc_special_price', $_POST['sale_price'] );
1153	}
1154	- ~~update_post_meta~~( $~~post_id,~~ '~~_wpsc_sku~~', ~~$_POST[~~'~~sku~~'] );



1155
1156	return $post_id;
1157	}


59
60	function wpsc_redirect_variation_update( $location, $post_id ) {
61	global $post;
62	+ if ( $post->post_parent > 0 && 'wpsc-product' == $post->post_type )
63	wp_redirect( admin_url( 'post.php?post='.$post->post_parent.'&action=edit' ) );
64	else
65	return $location;

71	global $post_type;
72	?>
73	<style>
74	+ <?php if ( isset( $_GET['post_type'] ) && ( 'wpsc-product' == $_GET['post_type'] ) \|\| ( !empty( $post_type ) && 'wpsc-product' == $post_type ) ) : ?>
75	#icon-edit { background:transparent url('<?php echo WPSC_CORE_IMAGES_URL.'/icon32.png';?>') no-repeat; }
76	<?php endif; ?>
77	</style>

85	foreach ( $product_data['meta'] as $meta_key => $meta_value )
86	$product_data['meta'][$meta_key] = $meta_value[0];
87
88	+ $product_meta = array();
89	+ if ( !empty( $product_data["_wpsc_product_metadata"] ) )
90	+ $product_meta = maybe_unserialize( $product_data["_wpsc_product_metadata"][0] );
91	+
92	if ( isset( $product_data['meta']['_wpsc_currency'] ) )
93	$product_alt_currency = maybe_unserialize( $product_data['meta']['_wpsc_currency'] );
94

135
136	<div class='wpsc_floatleft' style="width:85px;">
137	<label><?php _e( 'Price', 'wpsc' ); ?>:</label><br />
138	+ <input type='text' class='text' size='10' name='meta[_wpsc_price]' value='<?php echo ( isset($product_data['meta']['_wpsc_price']) ) ? number_format( (float)$product_data['meta']['_wpsc_price'], 2, '.', '' ) : '0.00'; ?>' />
139	</div>
140	<div class='wpsc_floatleft' style='display:<?php if ( ( $product_data['special'] == 1 ) ? 'block' : 'none'
141	); ?>; width:85px; margin-left:30px;'>
142	<label for='add_form_special'><?php _e( 'Sale Price', 'wpsc' ); ?>:</label>
143	<div id='add_special'>
144	+ <input type='text' size='10' value='<?php echo ( isset($product_data['meta']['_wpsc_special_price']) ) ? number_format( (float)$product_data['meta']['_wpsc_special_price'], 2, '.', '' ) : '0.00' ; ?>' name='meta[_wpsc_special_price]' />
145	</div>
146	</div>
147	<br style="clear:both" />

189	endif;
190
191	echo "<br style='clear:both' />
192	+ <br/><input id='add_form_donation' type='checkbox' name='meta[_wpsc_is_donation]' value='yes' " . ( isset($product_data['meta']['_wpsc_is_donation']) && ( $product_data['meta']['_wpsc_is_donation'] == 1 ) ? 'checked="checked"' : '' ) . " /> <label for='add_form_donation'>" . __( 'This is a donation, checking this box populates the donations widget.', 'wpsc' ) . "</label>";
193	?>
194	+ <br /><br /> <input type='checkbox' value='1' name='table_rate_price[state]' id='table_rate_price' <?php echo ( ( isset($product_meta['table_rate_price']['state']) && (bool)$product_meta['table_rate_price']['state'] == true ) ? 'checked=\'checked\'' : '' ); ?> />
195	<label for='table_rate_price'><?php _e( 'Table Rate Price', 'wpsc' ); ?></label>
196	<div id='table_rate'>
197	<a class='add_level' style='cursor:pointer;'><?php _e( '+ Add level', 'wpsc' ); ?></a><br />

239	foreach ( $product_data['meta'] as $meta_key => $meta_value )
240	$product_data['meta'][$meta_key] = $meta_value[0];
241
242	+ $product_meta = array();
243	+ if ( !empty( $product_data["_wpsc_product_metadata"] ) )
244	+ $product_meta = maybe_unserialize( $product_data["_wpsc_product_metadata"][0] );
245
246	if ( !isset( $product_meta['unpublish_when_none_left'] ) )
247	$product_meta['unpublish_when_none_left'] = ''; ?>

267	<?php if ( wpsc_product_has_children( $post->ID ) ) : ?>
268	<?php $stock = wpsc_variations_stock_remaining( $post->ID ); ?>
269	<p><?php _e( 'This Product has variations, to edit the quantity please use the Variation Controls below.' , 'wpsc' ); ?></p>
270	+ <p><?php printf( _n( "%s variant item in stock.", "%s variant items in stock.", $stock, 'wpsc' ), $stock ); ?></p>
271	<?php else: ?>
272	<label for="stock_limit_quantity"><?php _e( 'Quantity:', 'wpsc' ); ?></label>
273	<input type='text' id="stock_limit_quantity" name='meta[_wpsc_stock]' size='3' value='<?php echo $product_data['meta']['_wpsc_stock']; ?>' class='stock_limit_quantity' />
274	+ <?php
275	+ $remaining_quantity = wpsc_get_remaining_quantity( $post->ID );
276	+ $reserved_quantity = $product_data['meta']['_wpsc_stock'] - $remaining_quantity;
277	+ if($reserved_quantity): ?>
278	+ <p><em>
279	+ <?php
280	+ printf(_n('%s of them is reserved for pending or recently completed orders.', '%s of them are reserved for pending or recently completed orders.', $reserved_quantity, 'wpsc'), $reserved_quantity);
281	+ ?>
282	+ </em></p>
283	+ <?php endif; ?>
284	<?php endif; ?>
285	<div class='unpublish_when_none_left'>
286	<input type='checkbox' id="inform_when_oos" name='meta[_wpsc_product_metadata][unpublish_when_none_left]' class='inform_when_oos'<?php if ( $product_meta['unpublish_when_none_left'] == 1 ) echo ' checked="checked"'; ?> />
287	<label for="inform_when_oos"><?php _e( 'Notify site owner and unpublish this Product if stock runs out', 'wpsc' ); ?></label>
288	</div>
289	+ <p><em><?php _e( 'If stock runs out, this Product will not be available on the shop unless you untick this box or add more stock.', 'wpsc' ); ?></em></p>
290	</div> <?php
291	} else { ?>
292	<div style='display: none;' class='edit_stock'>

303	global $post, $wpdb, $wpsc_product_defaults;
304	$product_data = get_post_custom( $post->ID );
305
306	+ $product_data['meta'] = $product_meta = array();
307	+ if ( !empty( $product_data['_wpsc_product_metadata'] ) )
308	+ $product_data['meta'] = $product_meta = maybe_unserialize( $product_data['_wpsc_product_metadata'][0] );
309
310	if ( !isset( $product_data['meta']['_wpsc_custom_tax'] ) )
311	$product_data['meta']['_wpsc_custom_tax'] = '';

376	foreach ( $product_data['meta'] as $meta_key => $meta_value )
377	$product_data['meta'][$meta_key] = $meta_value[0];
378
379	+ $product_meta = array();
380	+ if ( !empty( $product_data["_wpsc_product_metadata"] ) )
381	+ $product_meta = maybe_unserialize( $product_data["_wpsc_product_metadata"][0] );
382
383	$siteurl = get_option( 'siteurl' );
384	$output = '';

521	foreach ( $product_data['meta'] as $meta_key => $meta_value )
522	$product_data['meta'][$meta_key] = $meta_value[0];
523
524	+ $product_meta = array();
525	+ if ( !empty( $product_data["_wpsc_product_metadata"] ) )
526	+ $product_meta = maybe_unserialize( $product_data["_wpsc_product_metadata"][0] );
527
528	$product_data['transformed'] = array();
529	if ( !isset( $product_meta['weight'] ) )
530	$product_meta['weight'] = "";
531	+
532	+ if( !isset( $product_meta['weight_unit'] ) )
533	+ $product_meta['weight_unit'] = '';
534	+
535	+ $product_data['transformed']['weight'] = wpsc_convert_weight( $product_meta['weight'], "pound", $product_meta['weight_unit']);
536	+
537	+ // Fix wp_debug notices
538	+ if(!isset($product_meta['dimensions'])){
539	+ $product_meta['dimensions'] = array(
540	+ 'height' => 0,
541	+ 'width' => 0,
542	+ 'length' => 0
543	+ );
544	+ }
545	+ if( !isset($product_meta['display_weight_as']) )
546	+ $product_meta['display_weight_as'] = '';
547
548	+ if( !isset( $product_meta['dimensions']['height_unit'] ) )
549	+ $product_meta['dimensions']['height_unit'] = '';
550
551	+ if( !isset( $product_meta['dimensions']['width_unit'] ) )
552	+ $product_meta['dimensions']['width_unit'] = '';
553	+
554	+ if( !isset( $product_meta['dimensions']['length_unit'] ) )
555	+ $product_meta['dimensions']['length_unit'] = '';
556	+
557	+ if( !isset( $product_meta['shipping'] ) ){
558	+ $product_meta['shipping']['local'] = '';
559	+ $product_meta['shipping']['international'] = '';
560	+ }
561	+ if( !isset( $product_meta['no_shipping'] ) )
562	+ $product_meta['no_shipping'] = '';
563	+ ?>
564	<table>
565
566	<!--USPS shipping changes-->
567	<tr>
568	<td>
569	+ <?php _e( 'Weight', 'wpsc' ); ?>
570	</td>
571	<td>
572	<input type='text' size='5' name='meta[_wpsc_product_metadata][weight]' value='<?php echo $product_data['transformed']['weight']; ?>' />

584	<?php _e( 'Height', 'wpsc' ); ?>
585	</td>
586	<td>
587	+ <input type='text' size='5' name='meta[_wpsc_product_metadata][dimensions][height]' value= '<?php echo $product_meta['dimensions']['height'] ; ?>'>
588	<select name='meta[_wpsc_product_metadata][dimensions][height_unit]'>
589	<option value='in' <?php echo ( ( $product_meta['dimensions']['height_unit'] == 'in' ) ? 'selected' : '' ); ?> ><?php _e( 'inches', 'wpsc' ); ?></option>
590	<option value='cm' <?php echo ( ( $product_meta['dimensions']['height_unit'] == 'cm' ) ? 'selected' : '' ); ?> ><?php _e( 'cm', 'wpsc' ); ?></option>

631	<?php _e( 'Local Shipping Fee', 'wpsc' ); ?>
632	</td>
633	<td>
634	+ <input type='text' size='10' name='meta[_wpsc_product_metadata][shipping][local]' value='<?php echo number_format( (float)$product_meta['shipping']['local'], 2, '.', '' ); ?>' />
635	</td>
636	</tr>
637

640	<?php _e( 'International Shipping Fee', 'wpsc' ); ?>
641	</td>
642	<td>
643	+ <input type='text' size='10' name='meta[_wpsc_product_metadata][shipping][international]' value='<?php echo number_format( (float)$product_meta['shipping']['international'], 2, '.', '' ); ?>' />
644	</td>
645	</tr>
646	<tr>

656	global $post, $wpdb, $variations_processor, $wpsc_product_defaults;
657	$product_data = get_post_custom( $post->ID );
658
659	+ $product_data['meta'] = $product_meta = array();
660	+ if ( !empty( $product_data['_wpsc_product_metadata'] ) )
661	+ $product_data['meta'] = $product_meta = maybe_unserialize( $product_data['_wpsc_product_metadata'][0] );
662
663	$custom_fields = $wpdb->get_results( "
664	SELECT

672	ORDER BY
673	LOWER(meta_key)", ARRAY_A
674	);
675	+ if( !isset( $product_meta['engraved'] ) )
676	+ $product_meta['engraved'] = '';
677	+
678	+ if( !isset( $product_meta['can_have_uploaded_image'] ) )
679	+ $product_meta['can_have_uploaded_image '] = '';
680	+
681	?>
682
683	<table>

712	</td>
713	</tr>
714	<tr>
715	+ <td class='itemfirstcol' colspan='2'><br /> <strong><?php _e( 'Merchant Notes:', 'wpsc' ); ?></strong><br />
716
717	<textarea cols='40' rows='3' name='meta[_wpsc_product_metadata][merchant_notes]' id='merchant_notes'>
718	<?php if ( isset( $product_meta['merchant_notes'] ) )

746	<td class='itemfirstcol' colspan='2'>
747
748	<input type='checkbox' <?php echo $product_meta['google_prohibited']; ?> name='meta[_wpsc_product_metadata][google_prohibited]' id='add_google_prohibited' /> <label for='add_google_prohibited'>
749	+ <?php _e( 'Prohibited <a href="http://checkout.google.com/support/sell/bin/answer.py?answer=75724">by Google?</a>', 'wpsc' ); ?>
750	+ </label><br />
751	</td>
752	</tr>
753	<?php

776	global $post, $wpdb, $variations_processor, $wpsc_product_defaults;
777	$product_data = get_post_custom( $post->ID );
778
779	+ $product_data['meta'] = $product_meta = array();
780	+ if ( !empty( $product_data['_wpsc_product_metadata'] ) )
781	+ $product_data['meta'] = $product_meta = maybe_unserialize( $product_data['_wpsc_product_metadata'][0] );
782
783	// Get External Link Values
784	$external_link_value = isset( $product_meta['external_link'] ) ? $product_meta['external_link'] : '';

794	<tbody>
795	<tr class="form-field">
796	<th valign="top" scope="row"><label for="external_link"><?php _e( 'External Link', 'wpsc' ); ?></label></th>
797	+ <td><input type="text" name="meta[_wpsc_product_metadata][external_link]" id="external_link" value="<?php esc_attr_e( $external_link_value ); ?>" size="50" style="width: 95%"></td>
798	</tr>
799	<tr class="form-field">
800	<th valign="top" scope="row"><label for="external_link_text"><?php _e( 'External Link Text', 'wpsc' ); ?></label></th>
801	+ <td><input type="text" name="meta[_wpsc_product_metadata][external_link_text]" id="external_link_text" value="<?php esc_attr_e( $external_link_text_value ); ?>" size="50" style="width: 95%"></td>
802	</tr>
803	<tr class="form-field">
804	<th valign="top" scope="row"><label for="external_link_target"><?php _e( 'External Link Target', 'wpsc' ); ?></label></th>
805	<td>
806	<select id="external_link_target" name="meta[_wpsc_product_metadata][external_link_target]">
807	<option value=""><?php _ex( 'Default (set by theme)', 'External product link target', 'wpsc' ); ?></option>
808	+ <option value="_self" <?php echo $external_link_target_value_selected['_self'] ; ?>><?php _e( 'Open link in the same window', 'wpsc' ); ?></option>
809	+ <option value="_blank" <?php echo $external_link_target_value_selected['_blank'] ; ?>><?php _e( 'Open link in a new window', 'wpsc' ); ?></option>
810	</select>
811	</td>
812	</tr>

833
834	}
835	function wpsc_product_download_forms() {

836	global $post, $wpdb, $wpsc_product_defaults;
837	$product_data = get_post_custom( $post->ID );
838	+ $output = '';
839	+ $product_data['meta'] = $product_meta = array();
840	+ if ( !empty( $product_data['_wpsc_product_metadata'] ) )
841	+ $product_data['meta'] = $product_meta = maybe_unserialize( $product_data['_wpsc_product_metadata'][0] );
842
843	$upload_max = wpsc_get_max_upload_size();
844	?>

852	<br />
853	<h4><?php _e( "Select an MP3 file to upload as a preview", 'wpsc' ) ?></h4>
854	<input type='file' name='preview_file' value='' /><br />
855	+
856	+ <h4><?php _e( "Your preview for this product:", 'wpsc' ) ?></h4>
857	+
858	+ <?php
859	+ $args = array(
860	+ 'post_type' => 'wpsc-preview-file',
861	+ 'post_parent' => $post->ID,
862	+ 'numberposts' => -1,
863	+ 'post_status' => 'all'
864	+ );
865	+
866	+ $preview_files = (array)get_posts( $args );
867	+
868	+ foreach ($preview_files as $preview)
869	+ echo $preview->post_title . '<br />';
870	+
871	+ ?>
872	+
873	<br />
874	<?php
875	}
876	$output = apply_filters( 'wpsc_downloads_metabox', $output );
877	}
878	function wpsc_product_label_forms() {
879	+ _deprecated_function( __FUNCTION__, '3.8' );
880	+ return false;























































881	}
882	/**
883	* Adding function to change text for media buttons

920	add_filter( 'gettext', 'wpsc_filter_delete_text', 12 , 3 );
921	add_filter( 'attachment_fields_to_edit', 'wpsc_attachment_fields', 11, 2 );
922	add_filter( 'gettext', 'wpsc_filter_feature_image_text', 12, 3 );
923	+ add_filter( 'gettext_with_context', 'wpsc_filter_gettex_with_context', 12, 4);
924
925	if ( isset( $_REQUEST["save"] ) && isset( $_REQUEST["attachments"] ) && is_array( $_REQUEST["attachments"] ) ) {
926	//wpsc_regenerate_thumbnails();
927	}
928
929	+ /*
930	+ * This filter overrides string with context translations
931	+ *
932	+ * @param $translation The current translation
933	+ * @param $text The text being translated
934	+ * @param $context The domain for the translation
935	+ * @param $domain The domain for the translation
936	+ * @return string The translated / filtered text.
937	+ */
938	+ function wpsc_filter_gettex_with_context( $translation, $text, $context, $domain ) {
939	+
940	+ if ( 'Taxonomy Parent' == $context && 'Parent' == $text && isset($_GET['taxonomy']) && 'wpsc-variation' == $_GET['taxonomy'] ) {
941	+ $translations = &get_translations_for_domain( $domain );
942	+ return $translations->translate( 'Variation set', 'wpsc' );
943	+ //this will never happen, this is here only for gettex to pick up the translation
944	+ return __( 'Variation set', 'wpsc' );
945	+ }
946	+ return $translation;
947	+ }
948	+
949	/*
950	* This filter translates string before it is displayed
951	* specifically for the words 'Use as featured image' with 'Use as Product Thumbnail' when the user is selecting a Product Thumbnail

962	$post = get_post( $_REQUEST['post_id'] );
963	if ( $post->post_type != 'wpsc-product' ) return $translation;
964	$translations = &get_translations_for_domain( $domain );
965	+ return $translations->translate( 'Use as Product Thumbnail', 'wpsc' );
966	+ //this will never happen, this is here only for gettex to pick up the translation
967	+ return __( 'Use as Product Thumbnail', 'wpsc' );
968	}
969	+ if ( 'The name is how it appears on your site.' == $text && isset($_GET['taxonomy']) && 'wpsc-variation' == $_GET['taxonomy'] ){
970	+ $translations = &get_translations_for_domain( $domain );
971	+ return $translations->translate( 'The name is how it appears on your site. <br><div class="error"><strong>Please read this carefully before starting to work with variations:</strong><br />Variations in WP e-Commerce are divided into sets. For example set <strong>Color</strong> could have variations <strong>Red, Green,</strong> and <strong>Blue</strong>. To create a variation set simply enter the <strong>name</strong> and push Enter key on your keyboard or click <strong>Add New Variation/Set</strong> button in the bottom of this page. Then you will be able to select it from <strong>Variation set</strong> drop-down menu and add some variations to it. To add a new variation set just select <strong>None</strong> in <strong>Variation set</strong> drop-down menu.</div>', 'wpsc' );
972	+ //this will never happen, this is here only for gettex to pick up the translation
973	+ return __( 'The name is how it appears on your site. <br><div class="error"><strong>Please read this carefully before starting to work with variations:</strong><br />Variations in WP e-Commerce are divided into sets. For example set <strong>Color</strong> could have variations <strong>Red, Green,</strong> and <strong>Blue</strong>. To create a set simply enter <stron>Name</strong> and push Enter key on your keyboard or click <strong>Add New Variation/Set</strong> button in the bottom of this page. Now you can select the variation set that you\'ve just created from <strong>Variation set</strong> drop-down menu and add some variations to it.</div>', 'wpsc' );
974	+ }
975	+
976	return $translation;
977	}
978	function wpsc_attachment_fields( $form_fields, $post ) {
979	+ $out = '';
980	+ if(isset($_GET["post_id"]))
981	+ $parent_post = get_post( absint($_GET["post_id"]) );
982	+ else
983	+ $parent_post = get_post( $post->post_parent );
984
985	+ if ( $parent_post->post_type == "wpsc-product" ) {


986
987	//Unfortunate hack, as I'm not sure why the From Computer tab doesn't process filters the same way the Gallery does
988
989	echo '
990	<script type="text/javascript">
991
992	+ jQuery(function(){


993
994	+ jQuery("a.wp-post-thumbnail").each(function(){
995	+ var product_image = jQuery(this).text();
996	+ if (product_image == "' . __('Use as featured image') . '") {
997	+ jQuery(this).text("' . __('Use as Product Thumbnail', 'wpsc') . '");
998	+ }
999	+ });
1000
1001	+ var trash = jQuery("#media-upload a.del-link").text();
1002
1003	if (trash == "Delete") {
1004	+ jQuery("#media-upload a.del-link").text("Trash");
1005	}
1006
1007

1057	$form_fields["wpsc_custom_thumb"] = array(
1058	"label" => __( "Products Page Thumbnail Size:", 'wpsc' ),
1059	"input" => "html", // this is default if "input" is omitted
1060	+ "helps" => "<span style='text-align:left; clear:both; display:block; padding-top:3px;'>" . __( 'Custom thumbnail size for this image on the main Product Page', 'wpsc') . "</span>",
1061	"html" => $custom_thumb_html
1062	);
1063

1106	</style>';
1107	print '
1108	<script type="text/javascript">
1109	+ jQuery(function(){
1110	+ jQuery("td.A1B1").each(function(){
1111
1112	+ var target = jQuery(this).next();
1113	+ jQuery("p > input.button", this).appendTo(target);



1114
1115	});
1116
1117	+ jQuery("a.wp-post-thumbnail").each(function(){
1118	+ var product_image = jQuery(this).text();
1119	+ if (product_image == "' . __('Use as featured image') . '") {
1120	+ jQuery(this).text("' . __('Use as Product Thumbnail', 'wpsc') . '");
1121	+ }
1122	+ });








1123	});
1124
1125	</script>';

1180	*/
1181
1182	function wpsc_save_quickedit_box( $post_id ) {
1183	+ global $current_screen;
1184	+ if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) \|\| $current_screen->id != 'edit-wpsc-product' )
1185	return;
1186
1187	$is_parent = ( bool )wpsc_product_has_children( $post_id );
1188	$product_meta = get_post_meta( $post_id, '_wpsc_product_metadata', true );


1189
1190	+ $weight_unit = $product_meta["weight_unit"];
1191	+ $weight = wpsc_convert_weight( $_POST["weight"], $weight_unit, "pound", true );
1192	+
1193	if ( isset( $product_meta["weight"] ) )
1194	unset( $product_meta["weight"] );
1195

1197
1198	if ( !$is_parent ) {
1199	update_post_meta( $post_id, '_wpsc_product_metadata', $product_meta );
1200	+ if(is_numeric($_POST['stock']))
1201	+ update_post_meta( $post_id, '_wpsc_stock', $_POST['stock'] );
1202	+ else
1203	+ update_post_meta( $post_id, '_wpsc_stock', '' );
1204	update_post_meta( $post_id, '_wpsc_price', $_POST['price'] );
1205	update_post_meta( $post_id, '_wpsc_special_price', $_POST['sale_price'] );
1206	}
1207	+ if($_POST['sku'] == __('N/A', 'wpsc'))
1208	+ update_post_meta( $post_id, '_wpsc_sku', '' );
1209	+ else
1210	+ update_post_meta( $post_id, '_wpsc_sku', $_POST['sku'] );
1211
1212	return $post_id;
1213	}

wpsc-admin/includes/product-functions.php CHANGED Viewed

	@@ -41,12 +41,14 @@ function wpsc_product_has_children($id){
41	* @return nothing
42	*/
43	function wpsc_admin_submit_product( $post_ID, $post ) {
44	-
45	- global $current_screen, $wpdb;
46
47	if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) \|\| $current_screen->id != 'wpsc-product' )
48	- return $post_ID;
49	-



50	//Type-casting ( not so much sanitization, which would be good to do )
51	$post_data = $_POST;
52	$product_id = $post_ID;
	@@ -54,13 +56,16 @@ function wpsc_admin_submit_product( $post_ID, $post ) {
54	$post_meta['meta'] = (array)$_POST['meta'];
55	$post_data['meta']['_wpsc_price'] = abs((float)str_replace( ',','',$post_data['meta']['_wpsc_price'] ));
56	$post_data['meta']['_wpsc_special_price'] = abs((float)str_replace( ',','',$post_data['meta']['_wpsc_special_price'] ));
57	- $post_data['meta']['_wpsc_sku'] = ~~$post_data[~~'~~meta~~']['~~_wpsc_sku~~'];
58	- ~~if (!isset(~~$post_data['meta']['~~_wpsc_is_donation~~'])) ~~$post_data['meta']['_wpsc_is_donation']~~ = '';
59	- $post_data['meta']['_wpsc_is_donation'] ~~= (int~~)~~(bool~~)~~$post_data['meta']['_wpsc_is_donation'];~~
60	- $post_data['meta']['~~_wpsc_stock~~'] = ~~(int)$post_data['meta']['_wpsc_stock']~~;
61	- ~~if (!isset($post_data['meta']['_wpsc_limited_stock'])) $post_data['meta']['_wpsc_limited_stock'] = '';~~
62	- ~~if((bool)~~$post_data['meta']['~~_wpsc_limited_stock~~'] != ~~true) {~~
63	- $post_data['meta']['~~_wpsc_stock~~'] ~~= false;~~



64	}
65	unset($post_data['meta']['_wpsc_limited_stock']);
66	if(!isset($post_data['meta']['_wpsc_product_metadata']['unpublish_when_none_left'])) $post_data['meta']['_wpsc_product_metadata']['unpublish_when_none_left'] = '';
	@@ -77,7 +82,7 @@ function wpsc_admin_submit_product( $post_ID, $post ) {
77	if(!isset($post_data['meta']['_wpsc_product_metadata']['display_weight_as'])) $post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = '';
78	if(!isset($post_data['meta']['_wpsc_product_metadata']['display_weight_as'])) $post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = '';
79
80	- $weight = wpsc_convert_weight($post_data['meta']['_wpsc_product_metadata']['weight'], $post_data['meta']['_wpsc_product_metadata']['weight_unit'], "pound");
81	$post_data['meta']['_wpsc_product_metadata']['weight'] = (float)$weight;
82	$post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = $post_data['meta']['_wpsc_product_metadata']['weight_unit'];
83
	@@ -154,7 +159,12 @@ function wpsc_admin_submit_product( $post_ID, $post ) {
154	}
155	}
156	// if we succeed, we can do further editing (todo - if_wp_error)
157	-





158	// and the meta
159	wpsc_update_product_meta($product_id, $post_data['meta']);
160
	@@ -184,6 +194,8 @@ function wpsc_admin_submit_product( $post_ID, $post ) {
184	}
185	return $product_id;
186	}


187	function wpsc_pre_update( $data , $postarr ) {
188	if ( (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) \|\| $postarr["post_type"] != 'wpsc-product' )
189	return $data;
	@@ -198,7 +210,7 @@ function wpsc_pre_update( $data , $postarr ) {
198	$data['post_status'] = 'inherit';
199	}
200
201	- if ( $postarr['meta']['_wpsc_product_metadata']['enable_comments'] == 0 \|\| empty( $postarr['meta']['_wpsc_product_metadata']['enable_comments'] ) )
202	$data["comment_status"] = "closed";
203	else
204	$data["comment_status"] = "open";
	@@ -212,6 +224,8 @@ function wpsc_pre_update( $data , $postarr ) {
212	add_filter( 'wp_insert_post_data','wpsc_pre_update', 99, 2 );
213	add_action( 'save_post', 'wpsc_admin_submit_product', 10, 2 );
214	add_action( 'admin_notices', 'wpsc_admin_submit_notices' );


215	function wpsc_admin_submit_notices() {
216	global $current_screen, $post;
217
	@@ -222,6 +236,17 @@ function wpsc_admin_submit_notices() {
222	unset( $_SESSION['product_error_messages'] );
223	}
224











225	/**
226	* wpsc_sanitise_product_forms function
227	*
	@@ -283,7 +308,7 @@ function wpsc_sanitise_product_forms($post_data = null) {
283	if(!isset($post_data['meta']['_wpsc_product_metadata']['display_weight_as'])) $post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = '';
284	if(!isset($post_data['meta']['_wpsc_product_metadata']['display_weight_as'])) $post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = '';
285
286	- $weight = wpsc_convert_weight($post_data['meta']['_wpsc_product_metadata']['weight'], $post_data['meta']['_wpsc_product_metadata']['weight_unit'], "pound");
287	$post_data['meta']['_wpsc_product_metadata']['weight'] = (float)$weight;
288	$post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = $post_data['meta']['_wpsc_product_metadata']['weight_unit'];
289
	@@ -410,7 +435,7 @@ function wpsc_insert_product($post_data, $wpsc_error = false) {
410	}
411	if ($product_id == 0) {
412	if ( $wpsc_error ) {
413	- return new WP_Error('db_update_error', __('Could not update product in the database'), $wpdb->last_error);
414	} else {
415	return false;
416	}
	@@ -427,7 +452,7 @@ function wpsc_insert_product($post_data, $wpsc_error = false) {
427	}
428	if ($product_id == 0 ) {
429	if ( $wp_error ) {
430	- return new WP_Error('db_insert_error', __('Could not insert product into the database'), $wpdb->last_error);
431	} else {
432	return 0;
433	}
	@@ -739,11 +764,7 @@ function wpsc_update_alt_product_currency($product_id, $newCurrency, $newPrice){
739	function wpsc_update_product_meta($product_id, $product_meta) {
740	if($product_meta != null) {
741	foreach((array)$product_meta as $key => $value) {
742	- if(~~get_post_meta(~~$product_id, $key) ~~!= false~~) {
743	- update_post_meta($product_id, $key, $value);
744	- } else {
745	- add_post_meta($product_id, $key, $value);
746	- }
747	}
748	}
749	}
	@@ -765,24 +786,24 @@ function wpsc_ajax_toggle_publish() {
765	*/
766
767	function wpsc_update_custom_meta($product_id, $post_data) {
768	- ~~global $wpdb;~~
769	if($post_data['new_custom_meta'] != null) {
770	- foreach((array)$post_data['new_custom_meta']['name'] as $key => $name) {
771	- $value = $post_data['new_custom_meta']['value'][(int)$key];
772	- if(($name != '') && ($value != '')) {
773	- add_post_meta($product_id, $name, $value);
774	- }
775	- }
776	}

777
778	- if (!isset($post_data['custom_meta'])) $post_data['custom_meta'] = '';
779	- if($post_data['custom_meta'] != null) {
780	- foreach((array)$post_data['custom_meta'] as $key => $values) {
781	- if(($values['name'] != '') && ($values['value'] != '')) {
782	- update_post_meta($product_id, $name, $value);
783	- }
784	- }
785	- }
786	}
787
788	/**
	@@ -928,6 +949,30 @@ function wpsc_item_reassign_file($product_id, $selected_files) {
928	return $fileid;
929	}
930
























931	/**
932	* wpsc_item_add_preview_file function
933	*
	@@ -937,6 +982,8 @@ function wpsc_item_reassign_file($product_id, $selected_files) {
937	function wpsc_item_add_preview_file($product_id, $preview_file) {
938	global $wpdb;
939


940	add_filter('upload_dir', 'wpsc_modify_preview_directory');
941	$overrides = array('test_form'=>false);
942
	@@ -976,8 +1023,6 @@ function wpsc_item_add_preview_file($product_id, $preview_file) {
976	remove_filter('upload_dir', 'wpsc_modify_upload_directory');
977	return $id;
978
979	-
980	- ///OLD CODE replaced 13/12/2010
981
982	}
983


41	* @return nothing
42	*/
43	function wpsc_admin_submit_product( $post_ID, $post ) {
44	+ global $current_screen, $wpdb;

45
46	if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) \|\| $current_screen->id != 'wpsc-product' )
47	+ return $post_ID;
48	+
49	+ if ( empty( $_POST['meta'] ) )
50	+ return $post_ID;
51	+
52	//Type-casting ( not so much sanitization, which would be good to do )
53	$post_data = $_POST;
54	$product_id = $post_ID;

56	$post_meta['meta'] = (array)$_POST['meta'];
57	$post_data['meta']['_wpsc_price'] = abs((float)str_replace( ',','',$post_data['meta']['_wpsc_price'] ));
58	$post_data['meta']['_wpsc_special_price'] = abs((float)str_replace( ',','',$post_data['meta']['_wpsc_special_price'] ));
59	+ if($post_data['meta']['_wpsc_sku'] == __('N/A', 'wpsc'))
60	+ $post_data['meta']['_wpsc_sku'] = '';
61	+ if(isset($post_data['meta']['_wpsc_is_donation']))
62	+ $post_data['meta']['_wpsc_is_donation'] = 1;
63	+ else
64	+ $post_data['meta']['_wpsc_is_donation'] = 0;
65	+ if (!isset($post_data['meta']['_wpsc_limited_stock'])){
66	+ $post_data['meta']['_wpsc_stock'] = false;
67	+ }else {
68	+ $post_data['meta']['_wpsc_stock'] = (int)$post_data['meta']['_wpsc_stock'];
69	}
70	unset($post_data['meta']['_wpsc_limited_stock']);
71	if(!isset($post_data['meta']['_wpsc_product_metadata']['unpublish_when_none_left'])) $post_data['meta']['_wpsc_product_metadata']['unpublish_when_none_left'] = '';

82	if(!isset($post_data['meta']['_wpsc_product_metadata']['display_weight_as'])) $post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = '';
83	if(!isset($post_data['meta']['_wpsc_product_metadata']['display_weight_as'])) $post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = '';
84
85	+ $weight = wpsc_convert_weight($post_data['meta']['_wpsc_product_metadata']['weight'], $post_data['meta']['_wpsc_product_metadata']['weight_unit'], "pound", true);
86	$post_data['meta']['_wpsc_product_metadata']['weight'] = (float)$weight;
87	$post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = $post_data['meta']['_wpsc_product_metadata']['weight_unit'];
88

159	}
160	}
161	// if we succeed, we can do further editing (todo - if_wp_error)
162	+
163	+ // if we have no categories selected, assign one.
164	+ if( isset( $post_data['tax_input']['wpsc_product_category'] ) && count( $post_data['tax_input']['wpsc_product_category'] ) == 1 && $post_data['tax_input']['wpsc_product_category'][0] == 0){
165	+ $post_data['tax_input']['wpsc_product_category'][1] = wpsc_add_product_category_default($product_id);
166	+
167	+ }
168	// and the meta
169	wpsc_update_product_meta($product_id, $post_data['meta']);
170

194	}
195	return $product_id;
196	}
197	+
198	+
199	function wpsc_pre_update( $data , $postarr ) {
200	if ( (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) \|\| $postarr["post_type"] != 'wpsc-product' )
201	return $data;

210	$data['post_status'] = 'inherit';
211	}
212
213	+ if ( !empty( $postarr['meta'] ) && ( $postarr['meta']['_wpsc_product_metadata']['enable_comments'] == 0 \|\| empty( $postarr['meta']['_wpsc_product_metadata']['enable_comments'] ) ) )
214	$data["comment_status"] = "closed";
215	else
216	$data["comment_status"] = "open";

224	add_filter( 'wp_insert_post_data','wpsc_pre_update', 99, 2 );
225	add_action( 'save_post', 'wpsc_admin_submit_product', 10, 2 );
226	add_action( 'admin_notices', 'wpsc_admin_submit_notices' );
227	+
228	+
229	function wpsc_admin_submit_notices() {
230	global $current_screen, $post;
231

236	unset( $_SESSION['product_error_messages'] );
237	}
238
239	+ /**
240	+ * wpsc_add_product_category_default, if there is no category assigned assign first product category as default
241	+ *
242	+ * @since 3.8
243	+ * @param $product_id (int) the Post ID
244	+ * @return null
245	+ */
246	+ function wpsc_add_product_category_default($product_id){
247	+ $terms = get_terms( 'wpsc_product_category', array( 'orderby' => 'id', 'hide_empty' => 0 ) );
248	+ wp_set_object_terms( $product_id , array( $terms[0]->slug ) , 'wpsc_product_category' );
249	+ }
250	/**
251	* wpsc_sanitise_product_forms function
252	*

308	if(!isset($post_data['meta']['_wpsc_product_metadata']['display_weight_as'])) $post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = '';
309	if(!isset($post_data['meta']['_wpsc_product_metadata']['display_weight_as'])) $post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = '';
310
311	+ $weight = wpsc_convert_weight($post_data['meta']['_wpsc_product_metadata']['weight'], $post_data['meta']['_wpsc_product_metadata']['weight_unit'], "pound", true);
312	$post_data['meta']['_wpsc_product_metadata']['weight'] = (float)$weight;
313	$post_data['meta']['_wpsc_product_metadata']['display_weight_as'] = $post_data['meta']['_wpsc_product_metadata']['weight_unit'];
314

435	}
436	if ($product_id == 0) {
437	if ( $wpsc_error ) {
438	+ return new WP_Error('db_update_error', __( 'Could not update product in the database', 'wpsc' ), $wpdb->last_error);
439	} else {
440	return false;
441	}

452	}
453	if ($product_id == 0 ) {
454	if ( $wp_error ) {
455	+ return new WP_Error('db_insert_error', __( 'Could not insert product into the database', 'wpsc' ), $wpdb->last_error);
456	} else {
457	return 0;
458	}

764	function wpsc_update_product_meta($product_id, $product_meta) {
765	if($product_meta != null) {
766	foreach((array)$product_meta as $key => $value) {
767	+ update_post_meta($product_id, $key, $value);




768	}
769	}
770	}

786	*/
787
788	function wpsc_update_custom_meta($product_id, $post_data) {
789	+
790	if($post_data['new_custom_meta'] != null) {
791	+ foreach((array)$post_data['new_custom_meta']['name'] as $key => $name) {
792	+ $value = $post_data['new_custom_meta']['value'][(int)$key];
793	+ if(($name != '') && ($value != '')) {
794	+ add_post_meta($product_id, $name, $value);
795	+ }

796	}
797	+ }
798
799	+ if (!isset($post_data['custom_meta'])) $post_data['custom_meta'] = '';
800	+ if($post_data['custom_meta'] != null) {
801	+ foreach((array)$post_data['custom_meta'] as $key => $values) {
802	+ if(($values['name'] != '') && ($values['value'] != '')) {
803	+ update_post_meta($product_id, $values['name'], $values['value']);
804	+ }
805	+ }
806	+ }
807	}
808
809	/**

949	return $fileid;
950	}
951
952	+ /**
953	+ * wpsc_delete_preview_file
954	+ *
955	+ * @param integer product ID
956	+ */
957	+
958	+ function wpsc_delete_preview_file($product_id) {
959	+
960	+ $args = array(
961	+ 'post_type' => 'wpsc-preview-file',
962	+ 'post_parent' => $product_id,
963	+ 'numberposts' => -1,
964	+ 'post_status' => 'all'
965	+ );
966	+
967	+ $preview_files = (array)get_posts( $args );
968	+
969	+ foreach( $preview_files as $preview ) {
970	+ $preview_id = $preview->ID;
971	+ wp_delete_post($preview_id);
972	+ }
973	+ return true;
974	+ }
975	+
976	/**
977	* wpsc_item_add_preview_file function
978	*

982	function wpsc_item_add_preview_file($product_id, $preview_file) {
983	global $wpdb;
984
985	+ wpsc_delete_preview_file($product_id);
986	+
987	add_filter('upload_dir', 'wpsc_modify_preview_directory');
988	$overrides = array('test_form'=>false);
989

1023	remove_filter('upload_dir', 'wpsc_modify_upload_directory');
1024	return $id;
1025


1026
1027	}
1028

wpsc-admin/includes/products.php CHANGED Viewed

	@@ -15,9 +15,8 @@
15	*/
16	function wpsc_admin_product_listing($parent_product = null) {
17	global $wp_query, $wpsc_products;
18	-
19	add_filter('the_title','esc_html');
20	- $args = array_merge( $wp_query->query, array( 'posts_per_page' => '-1', ~~'post_status' => 'all'~~ ) );
21	$wpsc_temp_query = query_posts( $args );
22	if ( empty($wpsc_products) )
23	$wpsc_products = &$wpsc_temp_query;
	@@ -26,6 +25,7 @@ function wpsc_admin_product_listing($parent_product = null) {
26	wpsc_product_row($product, $parent_product);
27	}
28	}

29	/**
30	* Adds the -trash status in the product row of manage products page
31	* @access public
	@@ -66,7 +66,7 @@ function wpsc_product_row(&$product, $parent_product = null) {
66	$title = get_the_title( $product->ID );
67
68	if ( empty( $title ) )
69	- $title = __('(no title)');
70
71	?>
72
	@@ -86,19 +86,19 @@ function wpsc_product_row(&$product, $parent_product = null) {
86
87	case 'date': /* !date case */
88	if ( '0000-00-00 00:00:00' == $product->post_date && 'date' == $column_name ) {
89	- $t_time = $h_time = __('Unpublished');
90	$time_diff = 0;
91	} else {
92	- $t_time = get_the_time(__('Y/m/d g:i:s A'));
93	$m_time = $product->post_date;
94	$time = get_post_time('G', true, $post);
95
96	$time_diff = time() - $time;
97
98	if ( $time_diff > 0 && $time_diff < 246060 )
99	- $h_time = sprintf( __('%s ago'), human_time_diff( $time ) );
100	else
101	- $h_time = mysql2date(__('Y/m/d'), $m_time);
102	}
103
104	echo '<td ' . $attributes . '>';
	@@ -108,14 +108,14 @@ function wpsc_product_row(&$product, $parent_product = null) {
108	echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $post, $column_name, $mode) . '</abbr>';
109	echo '<br />';
110	if ( 'publish' == $product->post_status ) {
111	- _e('Published');
112	} elseif ( 'future' == $product->post_status ) {
113	if ( $time_diff > 0 )
114	- echo '<strong class="attention">' . __('Missed schedule') . '</strong>';
115	else
116	- _e('Scheduled');
117	} else {
118	- _e('Last Modified');
119	}
120	echo '</td>';
121	break;
	@@ -128,11 +128,11 @@ function wpsc_product_row(&$product, $parent_product = null) {
128	<td <?php echo $attributes ?>>
129	<strong>
130	<?php if ( current_user_can('edit_post', $product->ID) && $product->post_status != 'trash' ) { ?>
131	- <a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit “%s”'), $title)); ?>"><?php echo $title ?></a>
132	<?php if($parent_product): ?>
133	<input type="hidden" class="wpsc_ie_id wpsc_ie_field" value="<?php echo $product->ID ?>">
134	<input type="text" class="wpsc_ie_title wpsc_ie_field" value="<?php echo $title ?>">
135	- <div class="wpsc_inline_actions"><input type="button" class="button-primary wpsc_ie_save" value="Save"><img src="<?php bloginfo('url') ?>/wp-admin/images/wpspin_light.gif" class="loading_indicator"><br/><input type="button" class="button-secondary cancel wpsc_ie_cancel" value="Cancel"></div>
136	<?php endif; ?>
137	<?php } else {
138	echo $title;
	@@ -164,15 +164,15 @@ function wpsc_product_row(&$product, $parent_product = null) {
164	$actions = array();
165	if ( current_user_can('edit_post', $product->ID) && 'trash' != $product->post_status ) {
166	$actions['edit'] = '<a class="edit-product" href="'.$edit_link.'" title="' . esc_attr(__('Edit this product', 'wpsc')) . '">'. __('Edit', 'wpsc') . '</a>';
167	- $actions['quick_edit'] = "<a class='wpsc_editinline ".$has_var."' title='".esc_attr(__('Quick Edit', 'wpsc'))."' href='#'>".__('Quick Edit')."</a>";
168	}
169
170	if ( in_array($product->post_status, array('pending', 'draft')) ) {
171	if ( current_user_can('edit_product', $product->ID) ) {
172	- $actions['view'] = '<a href="'.get_permalink($product->ID).'" title="'.esc_attr(sprintf(__('Preview “%s”'), $title)) . '" rel="permalink">'.__('Preview').'</a>';
173	}
174	} else if ( 'trash' != $product->post_status ) {
175	- $actions['view'] = '<a href="'.get_permalink($product->ID).'" title="'.esc_attr(sprintf(__('View “%s”'), $title)).'" rel="permalink">'.__('View').'</a>';
176	}
177
178	$actions = apply_filters('post_row_actions', $actions, $product);
	@@ -261,28 +261,11 @@ function wpsc_product_row(&$product, $parent_product = null) {
261	if(!isset($product_data['meta']['_wpsc_product_metadata']['weight'])) $product_data['meta']['_wpsc_product_metadata']['weight'] = "";
262	if(!isset($product_data['meta']['_wpsc_product_metadata']['weight_unit'])) $product_data['meta']['_wpsc_product_metadata']['weight_unit'] = "";
263
264	- $product_data['transformed']['weight'] = wpsc_convert_weight($product_data['meta']['_wpsc_product_metadata']['weight'], "pound", $product_data['meta']['_wpsc_product_metadata']['weight_unit']);
265	$weight = $product_data['transformed']['weight'];
266	if($weight == ''){
267	$weight = '0';
268	}
269	-
270	- $unit = $product_data['meta']['_wpsc_product_metadata']['weight_unit'];
271	- switch($unit) {
272	- case "pound":
273	- $unit = " lbs.";
274	- break;
275	- case "ounce":
276	- $unit = " oz.";
277	- break;
278	- case "kilograms":
279	- case "kilogram":
280	- $unit = " kgs.";
281	- break;
282	- case "gram":
283	- default:
284	- $unit = " g";
285	- }
286	?>
287	<td <?php echo $attributes ?>>
288	<span><?php echo $weight; ?></span>
	@@ -312,7 +295,7 @@ function wpsc_product_row(&$product, $parent_product = null) {
312	$out[] = "<a href='admin.php?page=wpsc-edit-products&category={$c->slug}'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>";
313	echo join( ', ', $out );
314	} else {
315	- _e('Uncategorized');
316	}
317	?></td>
318	<?php
	@@ -330,7 +313,7 @@ function wpsc_product_row(&$product, $parent_product = null) {
330	$out[] = "<a href='edit.php?tag=$c->slug'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>";
331	echo join( ', ', $out );
332	} else {
333	- _e('No Tags');
334	}
335	?></td>
336	<?php
	@@ -361,10 +344,10 @@ function wpsc_product_row(&$product, $parent_product = null) {
361	?>
362	<td <?php echo $attributes ?>><div class="post-com-count-wrapper">
363	<?php
364	- $pending_phrase = sprintf( __('%s pending'), number_format( $pending_comments ) );
365	if ( $pending_comments )
366	echo '<strong>';
367	- comments_number("<a href='edit-comments.php?p=$product->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link / _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$product->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . / translators: comment count link / _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$product->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . / translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
368	if ( $pending_comments )
369	echo '</strong>';
370	?>
	@@ -383,7 +366,7 @@ function wpsc_product_row(&$product, $parent_product = null) {
383
384	case 'control_view': /* !control view case */
385	?>
386	- <td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td>
387	<?php
388	break;
389
	@@ -391,7 +374,7 @@ function wpsc_product_row(&$product, $parent_product = null) {
391
392	case 'control_edit': /* !control edit case */
393	?>
394	- <td><?php if ( current_user_can('edit_post', $product->ID) ) { echo "<a href='$edit_link' class='edit'>" . __('Edit') . "</a>"; } ?></td>
395	<?php
396	break;
397
	@@ -399,7 +382,7 @@ function wpsc_product_row(&$product, $parent_product = null) {
399
400	case 'control_delete': /* !control delete case */
401	?>
402	- <td><?php if ( current_user_can('delete_post', $product->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&post=$id", 'delete-post_' . $product->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td>
403	<?php
404	break;
405


15	*/
16	function wpsc_admin_product_listing($parent_product = null) {
17	global $wp_query, $wpsc_products;

18	add_filter('the_title','esc_html');
19	+ $args = array_merge( $wp_query->query, array( 'posts_per_page' => '-1' ) );
20	$wpsc_temp_query = query_posts( $args );
21	if ( empty($wpsc_products) )
22	$wpsc_products = &$wpsc_temp_query;

25	wpsc_product_row($product, $parent_product);
26	}
27	}
28	+
29	/**
30	* Adds the -trash status in the product row of manage products page
31	* @access public

66	$title = get_the_title( $product->ID );
67
68	if ( empty( $title ) )
69	+ $title = __('(no title)', 'wpsc');
70
71	?>
72

86
87	case 'date': /* !date case */
88	if ( '0000-00-00 00:00:00' == $product->post_date && 'date' == $column_name ) {
89	+ $t_time = $h_time = __('Unpublished', 'wpsc');
90	$time_diff = 0;
91	} else {
92	+ $t_time = get_the_time(__('Y/m/d g:i:s A', 'wpsc'));
93	$m_time = $product->post_date;
94	$time = get_post_time('G', true, $post);
95
96	$time_diff = time() - $time;
97
98	if ( $time_diff > 0 && $time_diff < 246060 )
99	+ $h_time = sprintf( __('%s ago', 'wpsc'), human_time_diff( $time ) );
100	else
101	+ $h_time = mysql2date(__('Y/m/d', 'wpsc'), $m_time);
102	}
103
104	echo '<td ' . $attributes . '>';

108	echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $post, $column_name, $mode) . '</abbr>';
109	echo '<br />';
110	if ( 'publish' == $product->post_status ) {
111	+ _e('Published', 'wpsc');
112	} elseif ( 'future' == $product->post_status ) {
113	if ( $time_diff > 0 )
114	+ echo '<strong class="attention">' . __('Missed schedule', 'wpsc') . '</strong>';
115	else
116	+ _e('Scheduled', 'wpsc');
117	} else {
118	+ _e('Last Modified', 'wpsc');
119	}
120	echo '</td>';
121	break;

128	<td <?php echo $attributes ?>>
129	<strong>
130	<?php if ( current_user_can('edit_post', $product->ID) && $product->post_status != 'trash' ) { ?>
131	+ <a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit “%s”', 'wpsc'), $title)); ?>"><?php echo $title ?></a>
132	<?php if($parent_product): ?>
133	<input type="hidden" class="wpsc_ie_id wpsc_ie_field" value="<?php echo $product->ID ?>">
134	<input type="text" class="wpsc_ie_title wpsc_ie_field" value="<?php echo $title ?>">
135	+ <div class="wpsc_inline_actions"><input type="button" class="button-primary wpsc_ie_save" value="Save"><img src="<?php bloginfo('url') ?>/wp-admin/images/wpspin_light.gif" class="loading_indicator"><br/><input type="button" class="button-secondary cancel wpsc_ie_cancel" value="<?php _e('Cancel', 'wpsc'); ?>"></div>
136	<?php endif; ?>
137	<?php } else {
138	echo $title;

164	$actions = array();
165	if ( current_user_can('edit_post', $product->ID) && 'trash' != $product->post_status ) {
166	$actions['edit'] = '<a class="edit-product" href="'.$edit_link.'" title="' . esc_attr(__('Edit this product', 'wpsc')) . '">'. __('Edit', 'wpsc') . '</a>';
167	+ $actions['quick_edit'] = "<a class='wpsc_editinline ".$has_var."' title='".esc_attr(__('Quick Edit', 'wpsc'))."' href='#'>".__('Quick Edit', 'wpsc')."</a>";
168	}
169
170	if ( in_array($product->post_status, array('pending', 'draft')) ) {
171	if ( current_user_can('edit_product', $product->ID) ) {
172	+ $actions['view'] = '<a href="'.get_permalink($product->ID).'" title="'.esc_attr(sprintf(__('Preview “%s”', 'wpsc'), $title)) . '" rel="permalink">'.__('Preview', 'wpsc').'</a>';
173	}
174	} else if ( 'trash' != $product->post_status ) {
175	+ $actions['view'] = '<a href="'.get_permalink($product->ID).'" title="'.esc_attr(sprintf(__('View “%s”', 'wpsc'), $title)).'" rel="permalink">'.__('View', 'wpsc').'</a>';
176	}
177
178	$actions = apply_filters('post_row_actions', $actions, $product);

261	if(!isset($product_data['meta']['_wpsc_product_metadata']['weight'])) $product_data['meta']['_wpsc_product_metadata']['weight'] = "";
262	if(!isset($product_data['meta']['_wpsc_product_metadata']['weight_unit'])) $product_data['meta']['_wpsc_product_metadata']['weight_unit'] = "";
263
264	+ $product_data['transformed']['weight'] = wpsc_convert_weight($product_data['meta']['_wpsc_product_metadata']['weight'], "pound", $product_data['meta']['_wpsc_product_metadata']['weight_unit'], true);
265	$weight = $product_data['transformed']['weight'];
266	if($weight == ''){
267	$weight = '0';
268	}

















269	?>
270	<td <?php echo $attributes ?>>
271	<span><?php echo $weight; ?></span>

295	$out[] = "<a href='admin.php?page=wpsc-edit-products&category={$c->slug}'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>";
296	echo join( ', ', $out );
297	} else {
298	+ _e('Uncategorized', 'wpsc');
299	}
300	?></td>
301	<?php

313	$out[] = "<a href='edit.php?tag=$c->slug'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>";
314	echo join( ', ', $out );
315	} else {
316	+ _e('No Tags', 'wpsc');
317	}
318	?></td>
319	<?php

344	?>
345	<td <?php echo $attributes ?>><div class="post-com-count-wrapper">
346	<?php
347	+ $pending_phrase = sprintf( __('%s pending', 'wpsc'), number_format( $pending_comments ) );
348	if ( $pending_comments )
349	echo '<strong>';
350	+ comments_number("<a href='edit-comments.php?p=$product->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link / _x('0', 'comment count', 'wpsc') . '</span></a>', "<a href='edit-comments.php?p=$product->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . / translators: comment count link / _x('1', 'comment count', 'wpsc') . '</span></a>', "<a href='edit-comments.php?p=$product->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . / translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count', 'wpsc') . '</span></a>');
351	if ( $pending_comments )
352	echo '</strong>';
353	?>

366
367	case 'control_view': /* !control view case */
368	?>
369	+ <td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View', 'wpsc'); ?></a></td>
370	<?php
371	break;
372

374
375	case 'control_edit': /* !control edit case */
376	?>
377	+ <td><?php if ( current_user_can('edit_post', $product->ID) ) { echo "<a href='$edit_link' class='edit'>" . __('Edit', 'wpsc') . "</a>"; } ?></td>
378	<?php
379	break;
380

382
383	case 'control_delete': /* !control delete case */
384	?>
385	+ <td><?php if ( current_user_can('delete_post', $product->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&post=$id", 'delete-post_' . $product->ID) . "' class='delete'>" . __('Delete', 'wpsc') . "</a>"; } ?></td>
386	<?php
387	break;
388

wpsc-admin/includes/purchlogs_upgrade.php CHANGED Viewed

	@@ -32,23 +32,23 @@ if(isset($_POST)){
32	function wpsc_select_options_purchlogs_fix($id){
33	?>
34	<select name='<?php echo $id; ?>'>
35	- <option value='-1'>Select an Option</option>
36	- <option value='billingfirstname'>Billing First Name</option>
37	- <option value='billinglastname'>Billing Last Name</option>
38	- <option value='billingaddress'>Billing Address</option>
39	- <option value='billingcity'>Billing City</option>
40	- <option value='billingstate'>Billing State</option>
41	- <option value='billingcountry'>Billing Country</option>
42	- <option value='billingemail'>Billing Email</option>
43	- <option value='billingphone'>Billing Phone</option>
44	- <option value='billingpostcode'>Billing Post Code</option>
45	- <option value='shippingfirstname'>Shipping First Name</option>
46	- <option value='shippinglastname'>Shipping Last Name</option>
47	- <option value='shippingaddress'>Shipping Address</option>
48	- <option value='shippingcity'>Shipping City</option>
49	- <option value='shippingstate'>Shipping State</option>
50	- <option value='shippingcountry'>Shipping Country</option>
51	- <option value='shippingpostcode'>Shipping Post Code</option>
52
53	</select>
54	<?php
	@@ -59,14 +59,14 @@ function wpsc_select_options_purchlogs_fix($id){
59
60	<?php if ( $numChanged != 0 && $numQueries != 0 ) {
61	echo '<div id="message" class="updated fade"><p>';
62	- ~~printf~~(~~_n(~~ 'Check Out Form Fields updated.', '~~Check Out Form Fields updated.~~', ~~$numChanged, $numQueries~~ )~~, $numChanged , $numQueries)~~;
63	echo '</p></div>';
64	}
65
66	?>
67
68	- <h2><?php echo esc_html( __('Sales', 'wpsc').' ~~Upgrade Fix'~~ ); ?> </h2>
69	- <p><?php _e('Upgrading to WP e-Commerce 3.7 and later requires you to run this fix once.The following Boxes corresponds to the form fields in your current checkout page. All you have to do is select from the drop-down menu box what each of the following fields represent. Sorry for any inconvenience caused, but we\'re sure you\'ll agree that the new purchase logs are worth this minor hassle. '); ?> </p>
70
71	<div class="metabox-holder" style="width:700px">
72	<form action='' method='post'>
	@@ -97,7 +97,7 @@ function wpsc_select_options_purchlogs_fix($id){
97
98	}
99	?>
100	- <input type='submit' value='Apply' class='button-secondary action' />
101	</form>
102	</div>
103	</div>


32	function wpsc_select_options_purchlogs_fix($id){
33	?>
34	<select name='<?php echo $id; ?>'>
35	+ <option value='-1'><?php _e( 'Select an Option', 'wpsc' ); ?>'</option>
36	+ <option value='billingfirstname'><?php _e( 'Billing First Name', 'wpsc' ); ?></option>
37	+ <option value='billinglastname'><?php _e( 'Billing Last Name', 'wpsc' ); ?></option>
38	+ <option value='billingaddress'><?php _e( 'Billing Address', 'wpsc' ); ?></option>
39	+ <option value='billingcity'><?php _e( 'Billing City', 'wpsc' ); ?></option>
40	+ <option value='billingstate'><?php _e( 'Billing State', 'wpsc' ); ?></option>
41	+ <option value='billingcountry'><?php _e( 'Billing Country', 'wpsc' ); ?></option>
42	+ <option value='billingemail'><?php _e( 'Billing Email', 'wpsc' ); ?></option>
43	+ <option value='billingphone'><?php _e( 'Billing Phone', 'wpsc' ); ?></option>
44	+ <option value='billingpostcode'><?php _e( 'Billing Post Code', 'wpsc' ); ?></option>
45	+ <option value='shippingfirstname'><?php _e( 'Shipping First Name', 'wpsc' ); ?></option>
46	+ <option value='shippinglastname'><?php _e( 'Shipping Last Name', 'wpsc' ); ?></option>
47	+ <option value='shippingaddress'><?php _e( 'Shipping Address', 'wpsc' ); ?></option>
48	+ <option value='shippingcity'><?php _e( 'Shipping City', 'wpsc' ); ?></option>
49	+ <option value='shippingstate'><?php _e( 'Shipping State', 'wpsc' ); ?></option>
50	+ <option value='shippingcountry'><?php _e( 'Shipping Country', 'wpsc' ); ?></option>
51	+ <option value='shippingpostcode'><?php _e( 'Shipping Post Code', 'wpsc' ); ?></option>
52
53	</select>
54	<?php

59
60	<?php if ( $numChanged != 0 && $numQueries != 0 ) {
61	echo '<div id="message" class="updated fade"><p>';
62	+ _e( 'Check Out Form Fields updated.', 'wpsc' );
63	echo '</p></div>';
64	}
65
66	?>
67
68	+ <h2><?php echo esc_html( __('Sales Upgrade Fix', 'wpsc') ); ?> </h2>
69	+ <p><?php _e('Upgrading to WP e-Commerce 3.7 and later requires you to run this fix once.The following Boxes corresponds to the form fields in your current checkout page. All you have to do is select from the drop-down menu box what each of the following fields represent. Sorry for any inconvenience caused, but we\'re sure you\'ll agree that the new purchase logs are worth this minor hassle.', 'wpsc'); ?> </p>
70
71	<div class="metabox-holder" style="width:700px">
72	<form action='' method='post'>

97
98	}
99	?>
100	+ <input type='submit' value='<?php _e('Apply', 'wpsc'); ?>' class='button-secondary action' />
101	</form>
102	</div>
103	</div>

wpsc-admin/includes/save-data.functions.php CHANGED Viewed

@@ -68,7 +68,7 @@ function wpsc_custom_category_columns( $columns ) {
                 $custom_array = array(
                     'cb' => '<input type="checkbox">',
-            -
                    'image' => __( 'Image' )
                 );
                 $columns = array_merge( $custom_array, $columns );
@@ -98,66 +98,6 @@ function wpsc_custom_category_column_data( $string, $column_name, $term_id ) {
                 return $image;
+            }
-            -
            /**
-            -
             *  Create the actual drag and drop list used for the admin category view
-            -
             *
-            -
             * @param array $categories
-            -
             * @param int $level
-            -
             * @return string $output
-            -
             */
-            -
            function wpsc_admin_list_category_array($categories, $level = 0){
-            -
-            -
              $output = '';
-            -
              foreach($categories as $cat){
-            -
-            -
                $output .= "<li id='".$cat['id']."'>";
-            -
                $output .= "<div id='category-".$cat['id']."-container'>";
-            -
-            -
                $output .= "<div class='category_admin_list_img' id='category-".$cat['id']."-imgs'>";
-            -
                $output .= "<span title='click and drag to move' class='handle'>↕</span>";
-            -
                if($level > 0){
-            -
                  $output .= "<img class='category_indenter' src='".WPSC_CORE_IMAGES_URL."/indenter.gif' alt='' title='' />";
-            -
                }
-            -
                $output .= "<a class='row-title' href='".add_query_arg('category_id', $cat['id'])."'>";
-            -
                if(isset($cat['image'])){
-            -
                  $output .= "<img src=\"".WPSC_CATEGORY_URL.stripslashes($cat['image'])."\" title='".$cat['name']."' alt='".$cat['name']."' width='30' height='30' />";
-            -
                }else{
-            -
                  $output .= "<img src='".WPSC_CORE_IMAGES_URL."/no-image-uploaded.gif' title='".$cat['name']."' alt='".$cat['name']."' width='30' height='30' />";
-            -
                }
-            -
                $output .= stripslashes($cat['name'])."</a>";
-            -
-            -
                $output .= "<div class='row-actions'><span class='edit'><a class='edit-product' style='cursor:pointer;' title='Edit This Category' href='".add_query_arg('category_id', $cat['id'])."'>". __('Edit', 'wpsc')."</a>";
-            -
                $output .= "</span> | <span class='edit'>";
-            -
                $nonced_url = wp_nonce_url("admin.php?wpsc_admin_action=wpsc-delete-category&amp;deleteid={$cat['id']}", 'delete-category');
-            -
                $output .=  "<a class='delete_button' style='text-decoration:none;' href='".$nonced_url."' onclick=\"return conf();\" >". __('Delete', 'wpsc')."</a>";
-            -
                $output .=  "</span></div>";
-            -
                $output .= "</div>";
-            -
                if(is_array($cat['children'])){
-            -
                  $newhandle = "category-".$cat['id']."-children";
-            -
                  $output .= <<<EOT
-            -
              <script type="text/javascript">
-            -
                jQuery(document).ready(function(){
-            -
                  jQuery('#{$newhandle}').sortable({
-            -
                    axis: 'y',
-            -
                    containment: 'parent',
-            -
                    handle: '.handle',
-            -
                    tolerance: 'pointer',
-            -
                    update: function(event, ui){
-            -
                      categorySort(jQuery('#{$newhandle}').sortable('toArray'), 0);
-            -
                    }
-            -
                  });
-            -
                });
-            -
              </script>
-            -
            EOT;
-            -
                  $output .= "<ul id='{$newhandle}' class='ui-sortable'>";
-            -
                  $output .= wpsc_admin_list_category_array($cat['children'], ($level + 1));
-            -
                  $output .= "</ul>";
-            -
                }
-            -
                $output .= "</div></li>";
-            -
-            -
              }
-            -
              return $output;
-            -
            }
             /**
              * wpsc_admin_get_category_array
@@ -201,11 +141,17 @@ function wpsc_admin_category_forms_add() {
             	<h3><?php _e('Advanced Settings', 'wpsc'); ?></h3>
             	<div id="poststuff" class="postbox">
-            -
            		<h3 class="hndle"><?php _e('Presentation Settings'); ?></h3>
             		<div class="inside">
             			<input type='file' name='image' value='' /><br /><br />
-            -
             				<tr>
             					<td>
             						<?php _e('Catalog View', 'wpsc'); ?>
@@ -625,8 +571,6 @@ function wpsc_save_category_set($category_id, $tt_id) {
+            		}
             		//Good to here
-            -
                    $name = $_POST['name'];
-            -
                     if( isset( $_POST['tag_ID'] ) ) {
                         //Editing
                         $category_id= $_POST['tag_ID'];
@@ -640,7 +584,7 @@ function wpsc_save_category_set($category_id, $tt_id) {
             			wpsc_update_categorymeta($category_id, 'image', $image);
+            		}
-            -
            		if(is_numeric($_POST['height']) && is_numeric($_POST['width']) && ($image == null)) {
             			$imagedata = wpsc_get_categorymeta($category_id, 'image');
             			if($imagedata != null) {
             				$height = $_POST['height'];
@@ -674,7 +618,7 @@ function wpsc_save_category_set($category_id, $tt_id) {
             			$uses_additional_forms = false;
+            		}
-            -
            	  	if(($_POST['countrylist2'] != null ) && ($category_id > 0)){
             	    	$AllSelected = false;
             			$countryList = $wpdb->get_col("SELECT `id` FROM  `".WPSC_TABLE_CURRENCY_LIST."`");


68
69	$custom_array = array(
70	'cb' => '<input type="checkbox">',
71	+ 'image' => __( 'Image', 'wpsc' )
72	);
73
74	$columns = array_merge( $custom_array, $columns );

98	return $image;
99
100	}




























































101
102	/**
103	* wpsc_admin_get_category_array

141	<h3><?php _e('Advanced Settings', 'wpsc'); ?></h3>
142
143	<div id="poststuff" class="postbox">
144	+ <h3 class="hndle"><?php _e('Presentation Settings', 'wpsc'); ?></h3>
145
146	<div class="inside">
147	+ <tr>
148	+ <td>
149	+ <label for='image'><?php _e( 'Category Image' , 'wpsc' ); ?></label>
150	+ </td>
151	+ <td>
152	<input type='file' name='image' value='' /><br /><br />
153	+ </td>
154	+ </tr>
155	<tr>
156	<td>
157	<?php _e('Catalog View', 'wpsc'); ?>

571	}
572	//Good to here
573


574	if( isset( $_POST['tag_ID'] ) ) {
575	//Editing
576	$category_id= $_POST['tag_ID'];

584	wpsc_update_categorymeta($category_id, 'image', $image);
585	}
586
587	+ if ( !empty( $_POST['height'] ) && is_numeric( $_POST['height'] ) && !empty( $_POST['width'] ) && is_numeric( $_POST['width'] ) && $image == null ) {
588	$imagedata = wpsc_get_categorymeta($category_id, 'image');
589	if($imagedata != null) {
590	$height = $_POST['height'];

618	$uses_additional_forms = false;
619	}
620
621	+ if(isset( $_POST['countrylist2'] ) && !empty( $_POST['countrylist2'] ) && ($category_id > 0)){
622	$AllSelected = false;
623	$countryList = $wpdb->get_col("SELECT `id` FROM `".WPSC_TABLE_CURRENCY_LIST."`");
624

wpsc-admin/includes/settings-pages/admin.php CHANGED Viewed

	@@ -12,13 +12,13 @@ global $wpdb;
12	<tr>
13	<th scope="row"><?php _e('Max downloads per file', 'wpsc');?>: </th>
14	<td>
15	- <input type='text' size='10' value='<?php ~~echo~~ get_option('max_downloads'); ?>' name='wpsc_options[max_downloads]' />
16	</td>
17	</tr>
18	<?php
19	$wpsc_ip_lock_downloads1 = "";
20	$wpsc_ip_lock_downloads2 = "";
21	- switch(get_option('wpsc_ip_lock_downloads')) {
22	case 1:
23	$wpsc_ip_lock_downloads1 = "checked ='checked'";
24	break;
	@@ -44,7 +44,7 @@ global $wpdb;
44	<?php
45	$wpsc_check_mime_types1 = "";
46	$wpsc_check_mime_types2 = "";
47	- switch(get_option('wpsc_check_mime_types')) {
48	case 1:
49	$wpsc_check_mime_types2 = "checked ='checked'";
50	break;
	@@ -76,24 +76,24 @@ global $wpdb;
76	<?php _e('Purchase Log Email', 'wpsc');?>:
77	</th>
78	<td>
79	- <input class='text' name='wpsc_options[purch_log_email]' type='text' size='40' value='<?php ~~echo~~ get_option('purch_log_email'); ?>' />
80	</td>
81	</tr>
82	<tr>
83	<th scope="row">
84	- <?php _e('Purchase Receipt - Reply Address');?>:
85	</th>
86	<td>
87	- <input class='text' name='wpsc_options[return_email]' type='text' size='40' value='<?php ~~echo~~ get_option('return_email'); ?>' />
88	</td>
89	</tr>
90
91	<tr>
92	<th scope="row">
93	- <?php _e('Purchase Receipt - Reply Name');?>:
94	</th>
95	<td>
96	- <input class='text' name='wpsc_options[return_name]' type='text' size='40' value='<?php ~~echo~~ get_option('return_name'); ?>' />
97	</td>
98	</tr>
99
	@@ -102,7 +102,7 @@ global $wpdb;
102	<?php _e('Terms and Conditions', 'wpsc');?>:
103	</th>
104	<td>
105	- <textarea name='wpsc_options[terms_and_conditions]' cols='' rows='' style='width: 300px; height: 200px;'><?php ~~echo~~ stripslashes(get_option('terms_and_conditions')); ?></textarea>
106	</td>
107	</tr>
108
	@@ -121,7 +121,7 @@ global $wpdb;
121	</tr>
122	<tr>
123	<th><strong><?php _e('Purchase Receipt', 'wpsc');?></strong></th>
124	- <td><textarea name="wpsc_options[wpsc_email_receipt]" cols='' rows='' style='width: 300px; height: 200px;'><?php ~~echo~~ stripslashes(get_option('wpsc_email_receipt'));?></textarea></td>
125	</tr>
126	<tr>
127	<td class='wpsc_td_note' colspan='2'>
	@@ -132,7 +132,7 @@ global $wpdb;
132	</tr>
133	<tr>
134	<th><strong><?php _e('Admin Report', 'wpsc');?></strong></th>
135	- <td><textarea name="wpsc_options[wpsc_email_admin]" cols='' rows='' style='width: 300px; height: 200px;'><?php ~~echo~~ stripslashes(get_option('wpsc_email_admin'));?></textarea></td>
136	</tr>
137	</table>
138
	@@ -147,11 +147,11 @@ global $wpdb;
147	</tr>
148	<tr>
149	<th><strong><?php _e('Tracking Email Subject', 'wpsc');?></strong></th>
150	- <td><input name="wpsc_options[wpsc_trackingid_subject]" type='text' value='<?php ~~echo~~ stripslashes(get_option('wpsc_trackingid_subject'));?>' /></td>
151	</tr>
152	<tr>
153	<th><strong><?php _e('Tracking Email Message', 'wpsc');?></strong></th>
154	- <td><textarea name="wpsc_options[wpsc_trackingid_message]" cols='' rows='' style='width: 300px; height: 200px;'><?php ~~echo~~ stripslashes(get_option('wpsc_trackingid_message'));?></textarea></td>
155	</tr>
156	</table>
157
	@@ -170,8 +170,5 @@ global $wpdb;
170
171	<?php
172	}
173	-
174	-
175	-
176	-
177	?>


12	<tr>
13	<th scope="row"><?php _e('Max downloads per file', 'wpsc');?>: </th>
14	<td>
15	+ <input type='text' size='10' value='<?php esc_attr_e( get_option('max_downloads') ); ?>' name='wpsc_options[max_downloads]' />
16	</td>
17	</tr>
18	<?php
19	$wpsc_ip_lock_downloads1 = "";
20	$wpsc_ip_lock_downloads2 = "";
21	+ switch( esc_attr( get_option('wpsc_ip_lock_downloads') ) ) {
22	case 1:
23	$wpsc_ip_lock_downloads1 = "checked ='checked'";
24	break;

44	<?php
45	$wpsc_check_mime_types1 = "";
46	$wpsc_check_mime_types2 = "";
47	+ switch( esc_attr( get_option('wpsc_check_mime_types') ) ) {
48	case 1:
49	$wpsc_check_mime_types2 = "checked ='checked'";
50	break;

76	<?php _e('Purchase Log Email', 'wpsc');?>:
77	</th>
78	<td>
79	+ <input class='text' name='wpsc_options[purch_log_email]' type='text' size='40' value='<?php esc_attr_e( get_option('purch_log_email') ); ?>' />
80	</td>
81	</tr>
82	<tr>
83	<th scope="row">
84	+ <?php _e('Purchase Receipt - Reply Address', 'wpsc');?>:
85	</th>
86	<td>
87	+ <input class='text' name='wpsc_options[return_email]' type='text' size='40' value='<?php esc_attr_e( get_option('return_email') ); ?>' />
88	</td>
89	</tr>
90
91	<tr>
92	<th scope="row">
93	+ <?php _e('Purchase Receipt - Reply Name', 'wpsc');?>:
94	</th>
95	<td>
96	+ <input class='text' name='wpsc_options[return_name]' type='text' size='40' value='<?php esc_attr_e( get_option('return_name') ); ?>' />
97	</td>
98	</tr>
99

102	<?php _e('Terms and Conditions', 'wpsc');?>:
103	</th>
104	<td>
105	+ <textarea name='wpsc_options[terms_and_conditions]' cols='' rows='' style='width: 300px; height: 200px;'><?php esc_attr_e(stripslashes(get_option('terms_and_conditions') ) ); ?></textarea>
106	</td>
107	</tr>
108

121	</tr>
122	<tr>
123	<th><strong><?php _e('Purchase Receipt', 'wpsc');?></strong></th>
124	+ <td><textarea name="wpsc_options[wpsc_email_receipt]" cols='' rows='' style='width: 300px; height: 200px;'><?php esc_attr_e( stripslashes(get_option('wpsc_email_receipt') ) );?></textarea></td>
125	</tr>
126	<tr>
127	<td class='wpsc_td_note' colspan='2'>

132	</tr>
133	<tr>
134	<th><strong><?php _e('Admin Report', 'wpsc');?></strong></th>
135	+ <td><textarea name="wpsc_options[wpsc_email_admin]" cols='' rows='' style='width: 300px; height: 200px;'><?php esc_attr_e( stripslashes(get_option('wpsc_email_admin') ) );?></textarea></td>
136	</tr>
137	</table>
138

147	</tr>
148	<tr>
149	<th><strong><?php _e('Tracking Email Subject', 'wpsc');?></strong></th>
150	+ <td><input name="wpsc_options[wpsc_trackingid_subject]" type='text' value='<?php esc_attr_e( stripslashes(get_option('wpsc_trackingid_subject') ) );?>' /></td>
151	</tr>
152	<tr>
153	<th><strong><?php _e('Tracking Email Message', 'wpsc');?></strong></th>
154	+ <td><textarea name="wpsc_options[wpsc_trackingid_message]" cols='' rows='' style='width: 300px; height: 200px;'><?php esc_attr_e( stripslashes(get_option('wpsc_trackingid_message') ) );?></textarea></td>
155	</tr>
156	</table>
157

170
171	<?php
172	}
173	+



174	?>

wpsc-admin/includes/settings-pages/checkout.php CHANGED Viewed

	@@ -6,12 +6,12 @@ function wpsc_options_checkout(){
6
7	do_action('wpsc_checkout_form_fields_page');
8	$columns = array(
9	- 'drag' => 'Drag',
10	- 'name' => 'Name',
11	- 'type' => 'Type',
12	- 'unique_names' => 'Unique Names',
13	- 'mandatory' => 'Mandatory',
14	- 'trash' => 'Trash',
15	);
16	register_column_headers('display-checkout-list', $columns);
17
	@@ -28,14 +28,14 @@ function wpsc_options_checkout(){
28	<div class='metabox-holder' style='width:95%;'>
29	<div class='postbox'>
30	<input type='hidden' name='checkout_submits' value='true' />
31	- <h3 class='hndle'>Misc Checkout Options</h3>
32	<div class='inside'>
33	<table>
34	<tr>
35	<td><?php _e('Users must register before checking out', 'wpsc'); ?>:</td>
36	<td>
37	<?php
38	- $require_register = get_option('require_register');
39	$require_register1 = "";
40	$require_register2 = "";
41	switch($require_register) {
	@@ -59,7 +59,7 @@ function wpsc_options_checkout(){
59	<tr>
60	<?php
61	$shippingBilling = get_option('shippingsameasbilling');
62	-
63	switch($shippingBilling) {
64	case 1:
65	$shippingBilling1 = "checked ='checked'";
	@@ -72,9 +72,9 @@ function wpsc_options_checkout(){
72	?>
73	<td scope="row"><?php _e('Enable Shipping Same as Billing Option: ', 'wpsc'); ?>:</td>
74	<td>
75	- <input type='radio' value='1' name='wpsc_options[shippingsameasbilling]' id='shippingsameasbilling1' <?php if (~~isset~~($shippingBilling1)) echo $shippingBilling1; ?> />
76	<label for='shippingsameasbilling1'><?php _e('Yes', 'wpsc');?></label>
77	- <input type='radio' value='0' name='wpsc_options[shippingsameasbilling]' id='shippingsameasbilling2' <?php if (~~isset~~($shippingBilling2)) echo $shippingBilling2; ?> />
78	<label for='shippingsameasbilling2'><?php _e('No', 'wpsc');?></label>
79	</td>
80
	@@ -83,7 +83,7 @@ function wpsc_options_checkout(){
83	<td><?php _e('Force users to use SSL', 'wpsc'); ?>:</td>
84	<td>
85	<?php
86	- $wpsc_force_ssl = get_option('wpsc_force_ssl');
87	$wpsc_force_ssl1 = "";
88	$wpsc_force_ssl2 = "";
89	switch($wpsc_force_ssl) {
	@@ -121,7 +121,7 @@ function wpsc_options_checkout(){
121	if(isset($_GET['checkout-set']) && $_GET['checkout-set'] == $key) {
122	$selected_state = "selected='selected'";
123	}
124	- echo "<option {$selected_state} value='{$key}'>".stripslashes($value)."</option>";
125	}
126	?>
127	</select>
	@@ -131,7 +131,7 @@ function wpsc_options_checkout(){
131
132	<p class='add_new_form_set_forms'>
133	<label><?php _e("Add new Form Set",'wpsc'); ?>: <input type="text" value="" name="new_form_set" /></label>
134	- <input type="submit" value="<?php _e('Add'); ?>" class="button-secondary" id="formset-add-sumbit"/>
135	</p>
136
137	<?php
	@@ -147,7 +147,7 @@ function wpsc_options_checkout(){
147	$form_data = $wpdb->get_results($form_sql,ARRAY_A);
148	if (!isset($_GET['checkout-set'])) $_GET['checkout-set'] = '';
149
150	- $selected_checkout_set = $_GET['checkout-set'];
151	echo "<input type='hidden' name='selected_form_set' value='".$selected_checkout_set."' />";
152	?>
153	<table id="wpsc_checkout_list" class="widefat page fixed" cellspacing="0">
	@@ -167,8 +167,8 @@ function wpsc_options_checkout(){
167	<?php
168	foreach((array)$form_data as $form_field) {
169	echo "<tr id='checkout_".$form_field['id']."' class='checkout_form_field'>\n\r";
170	- echo '<td class="drag"><a href="" onclick="return false;" title="Click and Drag to Order Checkout Fields"><img src="' . WPSC_CORE_IMAGES_URL . '/roll-over-drag.jpg" alt="roll-over-drag" /></a></td>';
171	- echo "<td class='namecol'><input type='text' name='form_name[".$form_field['id']."]' value='".htmlentities(stripslashes($form_field['name']), ENT_QUOTES, "UTF-8")."' /></td>";
172
173	echo " <td class='typecol'>";
174	echo "<select class='wpsc_checkout_selectboxes' name='form_type[".$form_field['id']."]'>";
	@@ -177,17 +177,17 @@ function wpsc_options_checkout(){
177	if($form_type === $form_field['type']) {
178	$selected = "selected='selected'";
179	}
180	- echo "<option value='".$form_type."' ".$selected.">".~~__(~~$form_type_name, ~~'wpsc')~~."</option>";
181	}
182
183	echo "</select>";
184	if(in_array($form_field['type'], array('select','radio','checkbox'))){
185	- echo "<a class='wpsc_edit_checkout_options' rel='form_options[".$form_field['id']."]' href=''>more options</a>";
186	}
187	echo "</td>";
188	$checked = "";
189	echo "<td><select name='unique_names[".$form_field['id']."]'>";
190	- echo "<option value='-1'>Select a Unique Name</option>";
191	foreach($unique_names as $unique_name){
192	$selected = "";
193	if($unique_name == $form_field['unique_name']) {


6
7	do_action('wpsc_checkout_form_fields_page');
8	$columns = array(
9	+ 'drag' => __('Drag', 'wpsc'),
10	+ 'name' => __('Name', 'wpsc'),
11	+ 'type' => __('Type', 'wpsc'),
12	+ 'unique_names' => __('Unique Names', 'wpsc'),
13	+ 'mandatory' => __('Mandatory', 'wpsc'),
14	+ 'trash' => __('Trash', 'wpsc'),
15	);
16	register_column_headers('display-checkout-list', $columns);
17

28	<div class='metabox-holder' style='width:95%;'>
29	<div class='postbox'>
30	<input type='hidden' name='checkout_submits' value='true' />
31	+ <h3 class='hndle'><?php _e( 'Misc Checkout Options' , 'wpsc' ); ?></h3>
32	<div class='inside'>
33	<table>
34	<tr>
35	<td><?php _e('Users must register before checking out', 'wpsc'); ?>:</td>
36	<td>
37	<?php
38	+ $require_register = esc_attr( get_option('require_register') );
39	$require_register1 = "";
40	$require_register2 = "";
41	switch($require_register) {

59	<tr>
60	<?php
61	$shippingBilling = get_option('shippingsameasbilling');
62	+ $shippingBilling1 = $shippingBilling2 = '';
63	switch($shippingBilling) {
64	case 1:
65	$shippingBilling1 = "checked ='checked'";

72	?>
73	<td scope="row"><?php _e('Enable Shipping Same as Billing Option: ', 'wpsc'); ?>:</td>
74	<td>
75	+ <input type='radio' value='1' name='wpsc_options[shippingsameasbilling]' id='shippingsameasbilling1' <?php if (!empty($shippingBilling1)) echo $shippingBilling1; ?> />
76	<label for='shippingsameasbilling1'><?php _e('Yes', 'wpsc');?></label>
77	+ <input type='radio' value='0' name='wpsc_options[shippingsameasbilling]' id='shippingsameasbilling2' <?php if (!empty($shippingBilling2)) echo $shippingBilling2; ?> />
78	<label for='shippingsameasbilling2'><?php _e('No', 'wpsc');?></label>
79	</td>
80

83	<td><?php _e('Force users to use SSL', 'wpsc'); ?>:</td>
84	<td>
85	<?php
86	+ $wpsc_force_ssl = esc_attr( get_option('wpsc_force_ssl') );
87	$wpsc_force_ssl1 = "";
88	$wpsc_force_ssl2 = "";
89	switch($wpsc_force_ssl) {

121	if(isset($_GET['checkout-set']) && $_GET['checkout-set'] == $key) {
122	$selected_state = "selected='selected'";
123	}
124	+ echo "<option {$selected_state} value='{$key}'>".esc_attr( stripslashes( $value ) )."</option>";
125	}
126	?>
127	</select>

131
132	<p class='add_new_form_set_forms'>
133	<label><?php _e("Add new Form Set",'wpsc'); ?>: <input type="text" value="" name="new_form_set" /></label>
134	+ <input type="submit" value="<?php _e('Add', 'wpsc'); ?>" class="button-secondary" id="formset-add-sumbit"/>
135	</p>
136
137	<?php

147	$form_data = $wpdb->get_results($form_sql,ARRAY_A);
148	if (!isset($_GET['checkout-set'])) $_GET['checkout-set'] = '';
149
150	+ $selected_checkout_set = esc_attr($_GET['checkout-set']);
151	echo "<input type='hidden' name='selected_form_set' value='".$selected_checkout_set."' />";
152	?>
153	<table id="wpsc_checkout_list" class="widefat page fixed" cellspacing="0">

167	<?php
168	foreach((array)$form_data as $form_field) {
169	echo "<tr id='checkout_".$form_field['id']."' class='checkout_form_field'>\n\r";
170	+ echo '<td class="drag"><a href="" onclick="return false;" title="' . __('Click and Drag to Order Checkout Fields', 'wpsc') . '"><img src="' . WPSC_CORE_IMAGES_URL . '/roll-over-drag.jpg" alt="roll-over-drag" /></a></td>';
171	+ echo "<td class='namecol'><input type='text' name='form_name[".$form_field['id']."]' value='".esc_attr(htmlentities(stripslashes($form_field['name']), ENT_QUOTES, "UTF-8"))."' /></td>";
172
173	echo " <td class='typecol'>";
174	echo "<select class='wpsc_checkout_selectboxes' name='form_type[".$form_field['id']."]'>";

177	if($form_type === $form_field['type']) {
178	$selected = "selected='selected'";
179	}
180	+ echo "<option value='".$form_type."' ".$selected.">" . $form_type_name . "</option>";
181	}
182
183	echo "</select>";
184	if(in_array($form_field['type'], array('select','radio','checkbox'))){
185	+ echo "<a class='wpsc_edit_checkout_options' rel='form_options[".$form_field['id']."]' href=''>" . __('more options', 'wpsc') . "</a>";
186	}
187	echo "</td>";
188	$checked = "";
189	echo "<td><select name='unique_names[".$form_field['id']."]'>";
190	+ echo "<option value='-1'>" . __('Select a Unique Name', 'wpsc') . "</option>";
191	foreach($unique_names as $unique_name){
192	$selected = "";
193	if($unique_name == $form_field['unique_name']) {

wpsc-admin/includes/settings-pages/gateway.php CHANGED Viewed

	@@ -33,7 +33,7 @@ function wpsc_options_gateway() {
33	$gateway['internalname'] = '';
34
35	$gatewaylist = '';
36	- $gatewaylist .= "<option $disabled value='" . $gateway['internalname'] . "' " . $selected . " >" . $gateway['name'] . "</option>";
37	}
38	}
39	$nogw = '';
	@@ -64,17 +64,9 @@ function wpsc_options_gateway() {
64	<table id='gateway_options' >
65	<tr>
66	<td class='select_gateway'>
67	- ~~<?php~~ ~~if ( IS_WP27 ) {~~
68	- ?>
69	- <div class='~~postbox~~'>
70	- <h3 class='hndle'><?php _e( 'General Settings', 'wpsc' ); ?></h3>
71	- <div class='inside'>
72	- <?php } else { ?>
73	- <div class="categorisation_title">
74	- <strong class="form_group"><?php _e( 'Payment Gateways', 'wpsc' ); ?></strong>
75	- </div>
76	- <?php } ?>
77	-
78	<p><?php _e( 'Activate the payment gateways that you want to make available to your customers by selecting them below.', 'wpsc' ); ?></p>
79	<br />
80	<?php
	@@ -92,14 +84,14 @@ function wpsc_options_gateway() {
92	<a class='edit-payment-module' rel="<?php echo $gateway['internalname']; ?>" onclick="event.preventDefault();" title="Edit this Payment Module" href='<?php echo htmlspecialchars( add_query_arg( 'payment_module', $gateway['internalname'] ) ); ?>' style="cursor:pointer;">Edit</a>
93	</span> \|
94	</div>
95	- <p><input name='wpsc_options[custom_gateway_options][]' checked='checked' type='checkbox' value='<?php ~~echo~~ $gateway['internalname']; ?>' id='<?php ~~echo~~ $gateway['internalname']; ?>_id' />
96	- <label for='<?php ~~echo~~ $gateway['internalname']; ?>_id'><?php ~~echo~~ $gateway['name']; ?></label></p>
97	</div>
98	<?php } else { ?>
99	<div class="wpsc_shipping_options">
100	<div class='wpsc-shipping-actions wpsc-payment-actions'>
101	\| <span class="edit">
102	- <a class='edit-payment-module' rel="<?php echo $gateway['internalname']; ?>" onclick="event.preventDefault();" title="Edit this Payment Module" href='<?php echo htmlspecialchars( add_query_arg( 'payment_module', $gateway['internalname'] ) ); ?>' style="cursor:pointer;">Edit</a>
103	</span> \|
104	</div>
105	<p><input name='wpsc_options[custom_gateway_options][]' type='checkbox' value='<?php echo $gateway['internalname']; ?>' id='<?php echo $gateway['internalname']; ?>_id' />
	@@ -112,10 +104,9 @@ function wpsc_options_gateway() {
112	<input type='hidden' value='true' name='update_gateways' />
113	<input type='submit' value='<?php _e( 'Update »', 'wpsc' ) ?>' name='updateoption' />
114	</div>
115	- <?php if ( IS_WP27 ) { ?>
116	</div>
117	</div>
118	- ~~<?php } ?>~~
119	<h4><?php _e( 'We Recommend', 'wpsc' ); ?></h4>
120	<a style="border-bottom:none;" href="https://www.paypal.com/nz/mrb/pal=LENKCHY6CU2VY" target="_blank"><img src="<?php echo WPSC_CORE_IMAGES_URL; ?>/paypal-referal.gif" border="0" alt="Sign up for PayPal and start accepting credit card payments instantly." /></a> <br /><br />
121	<a style="border-bottom:none;" href="http://checkout.google.com/sell/?promo=seinstinct" target="_blank"><img src="https://checkout.google.com/buyer/images/google_checkout.gif" border="0" alt="Sign up for Google Checkout" /></a>


33	$gateway['internalname'] = '';
34
35	$gatewaylist = '';
36	+ $gatewaylist .= "<option $disabled value='" . esc_attr( $gateway['internalname'] ) . "' " . $selected . " >" . esc_attr( $gateway['name'] ) . "</option>";
37	}
38	}
39	$nogw = '';

64	<table id='gateway_options' >
65	<tr>
66	<td class='select_gateway'>
67	+ <div class='postbox'>
68	+ <h3 class='hndle'><?php _e( 'General Settings', 'wpsc' ); ?></h3>
69	+ <div class='inside'>








70	<p><?php _e( 'Activate the payment gateways that you want to make available to your customers by selecting them below.', 'wpsc' ); ?></p>
71	<br />
72	<?php

84	<a class='edit-payment-module' rel="<?php echo $gateway['internalname']; ?>" onclick="event.preventDefault();" title="Edit this Payment Module" href='<?php echo htmlspecialchars( add_query_arg( 'payment_module', $gateway['internalname'] ) ); ?>' style="cursor:pointer;">Edit</a>
85	</span> \|
86	</div>
87	+ <p><input name='wpsc_options[custom_gateway_options][]' checked='checked' type='checkbox' value='<?php esc_attr_e( $gateway['internalname'] ); ?>' id='<?php esc_attr_e( $gateway['internalname'] ); ?>_id' />
88	+ <label for='<?php esc_attr_e( $gateway['internalname'] ); ?>_id'><?php esc_attr_e( $gateway['name'] ); ?></label></p>
89	</div>
90	<?php } else { ?>
91	<div class="wpsc_shipping_options">
92	<div class='wpsc-shipping-actions wpsc-payment-actions'>
93	\| <span class="edit">
94	+ <a class='edit-payment-module' rel="<?php echo $gateway['internalname']; ?>" onclick="event.preventDefault();" title="Edit this Payment Module" href='<?php echo htmlspecialchars( add_query_arg( 'payment_module', $gateway['internalname'] ) ); ?>' style="cursor:pointer;"><?php _e( 'Edit' , 'wpsc' ); ?></a>
95	</span> \|
96	</div>
97	<p><input name='wpsc_options[custom_gateway_options][]' type='checkbox' value='<?php echo $gateway['internalname']; ?>' id='<?php echo $gateway['internalname']; ?>_id' />

104	<input type='hidden' value='true' name='update_gateways' />
105	<input type='submit' value='<?php _e( 'Update »', 'wpsc' ) ?>' name='updateoption' />
106	</div>

107	</div>
108	</div>
109	+
110	<h4><?php _e( 'We Recommend', 'wpsc' ); ?></h4>
111	<a style="border-bottom:none;" href="https://www.paypal.com/nz/mrb/pal=LENKCHY6CU2VY" target="_blank"><img src="<?php echo WPSC_CORE_IMAGES_URL; ?>/paypal-referal.gif" border="0" alt="Sign up for PayPal and start accepting credit card payments instantly." /></a> <br /><br />
112	<a style="border-bottom:none;" href="http://checkout.google.com/sell/?promo=seinstinct" target="_blank"><img src="https://checkout.google.com/buyer/images/google_checkout.gif" border="0" alt="Sign up for Google Checkout" /></a>

wpsc-admin/includes/settings-pages/general.php CHANGED Viewed

	@@ -16,24 +16,24 @@ function wpsc_options_general() {
16	<td>
17	<select name='wpsc_options[base_country]' onchange='submit_change_country();'>
18
19	- <?php echo country_list( get_option( 'base_country' ) ); ?>
20
21	</select>
22	<span id='options_country'>
23	<?php
24	- $region_list = $wpdb->get_results( "SELECT `" . WPSC_TABLE_REGION_TAX . "`.* FROM `" . WPSC_TABLE_REGION_TAX . "`, `" . WPSC_TABLE_CURRENCY_LIST . "` WHERE `" . WPSC_TABLE_CURRENCY_LIST . "`.`isocode` IN('" . get_option( 'base_country' ) . "') AND `" . WPSC_TABLE_CURRENCY_LIST . "`.`id` = `" . WPSC_TABLE_REGION_TAX . "`.`country_id`", ARRAY_A );
25	if ( !empty( $region_list ) ) { ?>
26
27	<select name='wpsc_options[base_region]'>
28	<?php
29	foreach ( $region_list as $region ) {
30	- if ( get_option( 'base_region' ) == $region['id'] ) {
31	$selected = "selected='selected'";
32	} else {
33	$selected = "";
34	}
35	?>
36	- <option value='<?php echo $region['id']; ?>' <?php echo $selected; ?> ><?php echo $region['name']; ?></option> <?php
37	}
38	?>
39	</select>
	@@ -58,8 +58,7 @@ function wpsc_options_general() {
58	echo "<em>" . __( "The Target Markets feature has been disabled because you have the Suhosin PHP extension installed on this server. If you need to use the Target Markets feature then disable the suhosin extension, if you can not do this, you will need to contact your hosting provider.", 'wpsc' ) . "</em>";
59	} else {
60	?>
61	- <span>Select: <a href='~~<?php~~ ~~echo~~ add_query_arg( array( 'selected_all' => 'all' ) ) ~~?>' class='wpsc_select_all'>All</a>  <a href='<?php echo~~ add_query_arg( array( 'selected_all' => 'none' ) ) ~~?>' class='wpsc_select_none'>None</a></~~span><br />
62	-
63	<div id='resizeable' class='ui-widget-content multiple-select'>
64	<?php
65	foreach ( (array)$countrylist as $country ) {
	@@ -69,12 +68,11 @@ function wpsc_options_general() {
69	<input type='checkbox' id="countrylist2-<?php echo $country['id']; ?>" name='countrylist2[]' value='<?php echo $country['id']; ?>' checked='checked' /> <label for="countrylist2-<?php echo $country['id']; ?>"><?php echo $country['country']; ?></label><br />
70	<?php } else {
71	?>
72	- <input type='checkbox' id="countrylist2-<?php echo $country['id']; ?>" name='countrylist2[]' value='<?php echo $country['id']; ?>' /> <label for="countrylist2-<?php echo $country['id']; ?>"><?php ~~echo~~ $country['country']; ?></label><br />
73	<?php }
74	} ?>
75	</div><br />
76	- Select the markets you are selling products to.
77	- <?php
78	}
79	?>
80	</td>
	@@ -90,7 +88,7 @@ function wpsc_options_general() {
90	<?php
91	$currency_data = $wpdb->get_results( "SELECT * FROM `" . WPSC_TABLE_CURRENCY_LIST . "` ORDER BY `country` ASC", ARRAY_A );
92	foreach ( $currency_data as $currency ) {
93	- if ( get_option( 'currency_type' ) == $currency['id'] ) {
94	$selected = "selected='selected'";
95	} else {
96	$selected = "";
	@@ -98,11 +96,11 @@ function wpsc_options_general() {
98	<option value='<?php echo $currency['id']; ?>' <?php echo $selected; ?> ><?php echo htmlspecialchars( $currency['country'] ); ?> (<?php echo $currency['currency']; ?>)</option>
99	<?php
100	}
101	- $currency_data = $wpdb->get_row( "SELECT `symbol`,`symbol_html`,`code` FROM `" . WPSC_TABLE_CURRENCY_LIST . "` WHERE `id`='" . get_option( 'currency_type' ) . "' LIMIT 1", ARRAY_A );
102	if ( $currency_data['symbol'] != '' ) {
103	- $currency_sign = $currency_data['symbol_html'];
104	} else {
105	- $currency_sign = $currency_data['code'];
106	}
107	?>
108	</select>
	@@ -112,7 +110,7 @@ function wpsc_options_general() {
112	<th scope="row"><?php _e( 'Currency Sign Location', 'wpsc' ); ?>:</th>
113	<td>
114	<?php
115	- $currency_sign_location = get_option( 'currency_sign_location' );
116	$csl1 = "";
117	$csl2 = "";
118	$csl3 = "";
	@@ -147,9 +145,9 @@ function wpsc_options_general() {
147	<tr>
148	<th scope="row"><?php _e( 'Thousands and decimal separators', 'wpsc' ); ?>:</th>
149	<td>
150	- <?php _e( 'Thousands separator', 'wpsc' ); ?>: <input name="wpsc_options[wpsc_thousands_separator]" type="text" maxlength="1" size="1" value="<?php echo get_option( 'wpsc_thousands_separator' ); ?>" /> <br />
151	- <?php _e( 'Decimal separator', 'wpsc' ); ?>: <input name="wpsc_options[wpsc_decimal_separator]" type="text" maxlength="1" size="1" value="<?php echo get_option( 'wpsc_decimal_separator' ); ?>" /> <br />
152	- <?php _e( 'Preview', 'wpsc' ); ~~?>:~~ 10<?php echo get_option( 'wpsc_thousands_separator' ); ?>000<?php echo get_option( 'wpsc_decimal_separator' ); ?>00
153	</td>
154	</tr>
155	</table>
	@@ -157,7 +155,7 @@ function wpsc_options_general() {
157	<div class="submit">
158	<input type='hidden' name='wpsc_admin_action' value='submit_options' />
159	<?php wp_nonce_field( 'update-options', 'wpsc-update-options' ); ?>
160	- <input type="submit" value="<?php _e( 'Update »', 'wpsc' ); ?>" name="updateoption"/>
161	</div>
162	</div>
163	</form>


16	<td>
17	<select name='wpsc_options[base_country]' onchange='submit_change_country();'>
18
19	+ <?php echo country_list( esc_attr( get_option( 'base_country' ) ) ); ?>
20
21	</select>
22	<span id='options_country'>
23	<?php
24	+ $region_list = $wpdb->get_results( "SELECT `" . WPSC_TABLE_REGION_TAX . "`.* FROM `" . WPSC_TABLE_REGION_TAX . "`, `" . WPSC_TABLE_CURRENCY_LIST . "` WHERE `" . WPSC_TABLE_CURRENCY_LIST . "`.`isocode` IN('" . esc_attr( get_option( 'base_country' ) ) . "') AND `" . WPSC_TABLE_CURRENCY_LIST . "`.`id` = `" . WPSC_TABLE_REGION_TAX . "`.`country_id`", ARRAY_A );
25	if ( !empty( $region_list ) ) { ?>
26
27	<select name='wpsc_options[base_region]'>
28	<?php
29	foreach ( $region_list as $region ) {
30	+ if ( esc_attr( get_option( 'base_region' ) ) == $region['id'] ) {
31	$selected = "selected='selected'";
32	} else {
33	$selected = "";
34	}
35	?>
36	+ <option value='<?php echo $region['id']; ?>' <?php echo $selected; ?> ><?php echo esc_attr( $region['name'] ); ?></option> <?php
37	}
38	?>
39	</select>

58	echo "<em>" . __( "The Target Markets feature has been disabled because you have the Suhosin PHP extension installed on this server. If you need to use the Target Markets feature then disable the suhosin extension, if you can not do this, you will need to contact your hosting provider.", 'wpsc' ) . "</em>";
59	} else {
60	?>
61	+ <span><?php printf(__('Select: <a href="%1$s" class="wpsc_select_all" title="All">All</a> <a href="%1$s" class="wpsc_select_none" title="None">None</a>' , 'wpsc') , add_query_arg( array( 'selected_all' => 'all' ) ), add_query_arg( array( 'selected_all' => 'none' ) ) ); ?></span><br />

62	<div id='resizeable' class='ui-widget-content multiple-select'>
63	<?php
64	foreach ( (array)$countrylist as $country ) {

68	<input type='checkbox' id="countrylist2-<?php echo $country['id']; ?>" name='countrylist2[]' value='<?php echo $country['id']; ?>' checked='checked' /> <label for="countrylist2-<?php echo $country['id']; ?>"><?php echo $country['country']; ?></label><br />
69	<?php } else {
70	?>
71	+ <input type='checkbox' id="countrylist2-<?php echo $country['id']; ?>" name='countrylist2[]' value='<?php echo $country['id']; ?>' /> <label for="countrylist2-<?php echo $country['id']; ?>"><?php esc_attr_e( $country['country'] ); ?></label><br />
72	<?php }
73	} ?>
74	</div><br />
75	+ <?php _e( 'Select the markets you are selling products to.' , 'wpsc');

76	}
77	?>
78	</td>

88	<?php
89	$currency_data = $wpdb->get_results( "SELECT * FROM `" . WPSC_TABLE_CURRENCY_LIST . "` ORDER BY `country` ASC", ARRAY_A );
90	foreach ( $currency_data as $currency ) {
91	+ if ( esc_attr( get_option( 'currency_type' ) ) == $currency['id'] ) {
92	$selected = "selected='selected'";
93	} else {
94	$selected = "";

96	<option value='<?php echo $currency['id']; ?>' <?php echo $selected; ?> ><?php echo htmlspecialchars( $currency['country'] ); ?> (<?php echo $currency['currency']; ?>)</option>
97	<?php
98	}
99	+ $currency_data = $wpdb->get_row( "SELECT `symbol`,`symbol_html`,`code` FROM `" . WPSC_TABLE_CURRENCY_LIST . "` WHERE `id`='" . esc_attr( get_option( 'currency_type' ) ) . "' LIMIT 1", ARRAY_A );
100	if ( $currency_data['symbol'] != '' ) {
101	+ $currency_sign = esc_attr( $currency_data['symbol_html'] );
102	} else {
103	+ $currency_sign = esc_attr( $currency_data['code'] );
104	}
105	?>
106	</select>

110	<th scope="row"><?php _e( 'Currency Sign Location', 'wpsc' ); ?>:</th>
111	<td>
112	<?php
113	+ $currency_sign_location = esc_attr( get_option( 'currency_sign_location' ) );
114	$csl1 = "";
115	$csl2 = "";
116	$csl3 = "";

145	<tr>
146	<th scope="row"><?php _e( 'Thousands and decimal separators', 'wpsc' ); ?>:</th>
147	<td>
148	+ <?php _e( 'Thousands separator', 'wpsc' ); ?>: <input name="wpsc_options[wpsc_thousands_separator]" type="text" maxlength="1" size="1" value="<?php echo esc_attr( stripslashes( get_option( 'wpsc_thousands_separator' ) ) ); ?>" /> <br />
149	+ <?php _e( 'Decimal separator', 'wpsc' ); ?>: <input name="wpsc_options[wpsc_decimal_separator]" type="text" maxlength="1" size="1" value="<?php echo esc_attr( stripslashes( get_option( 'wpsc_decimal_separator' ) ) ); ?>" /> <br />
150	+ <?php _e( 'Preview:', 'wpsc' ); ?> 10<?php echo esc_attr( stripslashes( get_option( 'wpsc_thousands_separator' ) ) ); ?>000<?php echo esc_attr( stripslashes( get_option( 'wpsc_decimal_separator' ) ) ); ?>00
151	</td>
152	</tr>
153	</table>

155	<div class="submit">
156	<input type='hidden' name='wpsc_admin_action' value='submit_options' />
157	<?php wp_nonce_field( 'update-options', 'wpsc-update-options' ); ?>
158	+ <input type="submit" value="<?php _e( 'Update »', 'wpsc' ); ?>" name="updateoption" />
159	</div>
160	</div>
161	</form>

wpsc-admin/includes/settings-pages/import.php CHANGED Viewed

	@@ -49,8 +49,8 @@ function wpsc_options_import() {
49	<br />
50	</td><td>
51	<select name='post_status'>
52	- <option value='publish'>Publish</option>
53	- <option value='draft'>Draft</option>
54	</select>
55	</td></tr>
56	</table>
	@@ -61,7 +61,7 @@ function wpsc_options_import() {
61	foreach ( (array)$data1 as $key => $datum ) {
62	?>
63	<div style='width:100%;' class='postbox'>
64	- <h3 class='hndle'>Column (~~<?php~~ ~~echo~~ $key + 1; ~~?>)</~~h3>
65	<div class='inside'>
66	<table>
67	<tr><td style='width:80%;'>
	@@ -75,15 +75,15 @@ function wpsc_options_import() {
75	</td><td>
76	<select name='value_name[]'>
77	<!-- /* These are the current fields that can be imported with products, to add additional fields add more <option> to this dorpdown list */ -->
78	- <option value='name'>Product Name</option>
79	- <option value='description'>Description</option>
80	- <option value='additional_description'>Additional Description</option>
81	- <option value='price'>Price</option>
82	- <option value='sku'>SKU</option>
83	- <option value='weight'>Weight</option>
84	- <option value='weight_unit'>Weight Unit</option>
85	- <option value='quantity'>Stock Quantity</option>
86	- <option value='quantity_limited'>Stock Quantity Limit</option>
87	</select>
88	</td></tr>
89	</table>
	@@ -102,7 +102,7 @@ function wpsc_options_import() {
102	</div>
103	<?php
104	} else {
105	- echo "<br /><br />There was an error while uploading your csv file.";
106	}
107	}
108	if ( isset( $_POST['csv_action'] ) && ('import' == $_POST['csv_action']) ) {
	@@ -123,23 +123,23 @@ function wpsc_options_import() {
123
124	for ( $i = 0; $i < $num; $i++ ) {
125	$product_columns = array(
126	- 'post_title' => $cvs_data2['name'][$i],
127	- 'content' => $cvs_data2['description'][$i],
128	- 'additional_description' => $cvs_data2['additional_description'][$i],
129	- 'price' => str_replace( '$', '', $cvs_data2['price'][$i] ),
130	- 'weight' => $cvs_data2['weight'][$i],
131	- 'weight_unit' => $cvs_data2['weight_unit'][$i],
132	'pnp' => null,
133	'international_pnp' => null,
134	'file' => null,
135	'image' => '0',
136	- 'quantity_limited' => $cvs_data2['quantity_limited'][$i],
137	- 'quantity' => $cvs_data2['quantity'][$i],
138	'special' => null,
139	'special_price' => null,
140	'display_frontpage' => null,
141	'notax' => null,
142	- 'publish' => $status,
143	'active' => null,
144	'donation' => null,
145	'no_shipping' => null,
	@@ -150,20 +150,20 @@ function wpsc_options_import() {
150
151	),
152	'meta' => array(
153	- '_wpsc_price' => str_replace( '$', '', $cvs_data2['price'][$i] ),
154	- '_wpsc_sku' => $cvs_data2['sku'][$i],
155	- '_wpsc_stock' => $cvs_data2['quantity'][$i],
156	- '_wpsc_limited_stock' => $cvs_data2['quantity_limited'][$i],
157	'_wpsc_product_metadata' => array(
158	- 'weight' => $cvs_data2['weight'][$i],
159	- 'weight_unit' => $cvs_data2['weight_unit'][$i],
160	)
161	)
162	);
163	$product_columns = wpsc_sanitise_product_forms( $product_columns );
164	wpsc_insert_product( $product_columns );
165	}
166	- echo "<br /><br />Success, your <a href='".admin_url('edit.php?post_type=wpsc-product')~~."'>products</a> have been upload."~~;
167	}
168	?>
169	</div>


49	<br />
50	</td><td>
51	<select name='post_status'>
52	+ <option value='publish'><?php _e('Publish', 'wpsc'); ?></option>
53	+ <option value='draft'><?php _e('Draft', 'wpsc'); ?></option>
54	</select>
55	</td></tr>
56	</table>

61	foreach ( (array)$data1 as $key => $datum ) {
62	?>
63	<div style='width:100%;' class='postbox'>
64	+ <h3 class='hndle'><?php printf(__('Column (%s)', 'wpsc'), ($key + 1)); ?></h3>
65	<div class='inside'>
66	<table>
67	<tr><td style='width:80%;'>

75	</td><td>
76	<select name='value_name[]'>
77	<!-- /* These are the current fields that can be imported with products, to add additional fields add more <option> to this dorpdown list */ -->
78	+ <option value='name'><?php _e('Product Name', 'wpsc'); ?></option>
79	+ <option value='description'><?php _e('Description', 'wpsc'); ?></option>
80	+ <option value='additional_description'><?php _e('Additional Description', 'wpsc'); ?></option>
81	+ <option value='price'><?php _e('Price', 'wpsc'); ?></option>
82	+ <option value='sku'><?php _e('SKU', 'wpsc'); ?></option>
83	+ <option value='weight'><?php _e('Weight', 'wpsc'); ?></option>
84	+ <option value='weight_unit'><?php _e('Weight Unit', 'wpsc'); ?></option>
85	+ <option value='quantity'><?php _e('Stock Quantity', 'wpsc'); ?></option>
86	+ <option value='quantity_limited'><?php _e('Stock Quantity Limit', 'wpsc'); ?></option>
87	</select>
88	</td></tr>
89	</table>

102	</div>
103	<?php
104	} else {
105	+ echo "<br /><br />" . __('There was an error while uploading your csv file.', 'wpsc');
106	}
107	}
108	if ( isset( $_POST['csv_action'] ) && ('import' == $_POST['csv_action']) ) {

123
124	for ( $i = 0; $i < $num; $i++ ) {
125	$product_columns = array(
126	+ 'post_title' => esc_attr( $cvs_data2['name'][$i] ),
127	+ 'content' => esc_attr( $cvs_data2['description'][$i] ),
128	+ 'additional_description' => esc_attr( $cvs_data2['additional_description'][$i] ),
129	+ 'price' => esc_attr( str_replace( '$', '', $cvs_data2['price'][$i] ) ),
130	+ 'weight' => esc_attr( $cvs_data2['weight'][$i] ),
131	+ 'weight_unit' => esc_attr( $cvs_data2['weight_unit'][$i] ),
132	'pnp' => null,
133	'international_pnp' => null,
134	'file' => null,
135	'image' => '0',
136	+ 'quantity_limited' => esc_attr( $cvs_data2['quantity_limited'][$i] ),
137	+ 'quantity' => esc_attr( $cvs_data2['quantity'][$i] ),
138	'special' => null,
139	'special_price' => null,
140	'display_frontpage' => null,
141	'notax' => null,
142	+ 'publish' => esc_attr( $status ),
143	'active' => null,
144	'donation' => null,
145	'no_shipping' => null,

150
151	),
152	'meta' => array(
153	+ '_wpsc_price' => esc_attr( str_replace( '$', '', $cvs_data2['price'][$i] ) ),
154	+ '_wpsc_sku' => esc_attr( $cvs_data2['sku'][$i] ),
155	+ '_wpsc_stock' => esc_attr( $cvs_data2['quantity'][$i] ),
156	+ '_wpsc_limited_stock' => esc_attr( $cvs_data2['quantity_limited'][$i] ),
157	'_wpsc_product_metadata' => array(
158	+ 'weight' => esc_attr( $cvs_data2['weight'][$i] ),
159	+ 'weight_unit' => esc_attr( $cvs_data2['weight_unit'][$i] ),
160	)
161	)
162	);
163	$product_columns = wpsc_sanitise_product_forms( $product_columns );
164	wpsc_insert_product( $product_columns );
165	}
166	+ echo "<br /><br />". sprintf(__("Success, your <a href='%s'>products</a> have been upload.", "wpsc"), admin_url('edit.php?post_type=wpsc-product'));
167	}
168	?>
169	</div>

wpsc-admin/includes/settings-pages/marketing.php CHANGED Viewed

	@@ -100,7 +100,7 @@ function wpsc_google_merch_center_meta_box() { ?>
100
101	<?php $google_feed_url = get_bloginfo( 'url' ) . "/index.php?rss=true&action=product_list&xmlformat=google"; ?>
102
103	- <a href="<?php ~~echo~~ htmlentities( $google_feed_url, ENT_QUOTES, 'UTF-8' ); ?>"><?php ~~echo~~ htmlentities( $google_feed_url, ENT_QUOTES, 'UTF-8' ); ?></a>
104
105	<?php
106	}


100
101	<?php $google_feed_url = get_bloginfo( 'url' ) . "/index.php?rss=true&action=product_list&xmlformat=google"; ?>
102
103	+ <a href="<?php esc_attr_e( htmlentities( $google_feed_url, ENT_QUOTES, 'UTF-8' ) ); ?>"><?php esc_attr_e( htmlentities( $google_feed_url, ENT_QUOTES, 'UTF-8' ) ); ?></a>
104
105	<?php
106	}

wpsc-admin/includes/settings-pages/presentation.php CHANGED Viewed

	@@ -75,7 +75,7 @@ function wpsc_theme_presentation_page_metabox(){
75	if ( isset( $_SESSION['wpsc_themes_backup'] ) && ($_SESSION['wpsc_themes_backup'] == true) ) {
76	?>
77	<div class="updated fade below-h2" id="message" style="background-color: rgb(255, 251, 204);">
78	- <p><?php _e( "Thanks, you have made a succesful backup of your theme. It is located at the URL below. Please note each backup you create will replace your previous backups." ); ?></p>
79	<p>URL: <?php echo "/" . str_replace( ABSPATH, "", WPSC_THEME_BACKUP_DIR ); ?></p>
80	</div>
81	<?php
	@@ -105,8 +105,8 @@ If you want to change the look of your site, select the files you want to edit f
105	if(false !== array_search($file, (array)$themes_location))
106	$selected = 'checked="checked"';
107	?>
108	- <li><input type='checkbox' id='<?php echo $id; ?>' <?php echo $selected; ?> value='<?php ~~echo~~ $file ?>' name='wpsc_templates_to_port[]' />
109	- <label for='<?php echo $id; ?>'><?php ~~echo~~ $file; ?></label></li>
110	<?php } ?>
111	</ul>
112	<p>
	@@ -151,36 +151,28 @@ If you want to change the look of your site, select the files you want to edit f
151	function options_categorylist() {
152	global $wpdb;
153
154	- $current_default = get_option( 'wpsc_default_category' );
155	$group_data = get_terms( 'wpsc_product_category', 'hide_empty=0&parent=0' );
156	$categorylist = "<select name='wpsc_options[wpsc_default_category]'>";
157
158	- if ( ~~get_option(~~ ~~'wpsc_default_category' )~~ == 'all' )
159	$selected = "selected='selected'";
160	else
161	$selected = '';
162
163	$categorylist .= "<option value='all' " . $selected . " >" . __( 'Show All Products', 'wpsc' ) . "</option>";
164
165	- if ( ~~get_option(~~ ~~'wpsc_default_category' )~~ == 'list' )
166	$selected = "selected='selected'";
167	else
168	$selected = '';
169
170	$categorylist .= "<option value='list' " . $selected . " >" . __( 'Show list of product categories', 'wpsc' ) . "</option>";
171	- /*
172
173	- if ( get_option( 'wpsc_default_category' ) == 'all+list' )
174	- $selected = "selected='selected'";
175	- else
176	- $selected = '';
177	-
178	- $categorylist .= "<option value='all+list' " . $selected . " >" . __( 'Show all products + list', 'wpsc' ) . "</option>";
179	- */
180	$categorylist .= "<optgroup label='Product Categories'>";
181	foreach ( $group_data as $group ) {
182	$selected = "";
183	- if ( ~~get_option(~~ ~~'wpsc_default_category' )~~ == $group->term_id )
184	$selected = "selected='selected'";
185	else
186	$selected = "";
	@@ -189,7 +181,7 @@ function options_categorylist() {
189	$category_data = get_terms( 'wpsc_product_category', 'hide_empty=0&parent=' . $group->term_id );
190	if ( $category_data != null ) {
191	foreach ( $category_data as $category ) {
192	- if ( ~~get_option(~~ ~~'wpsc_default_category' )~~ == $category->term_id )
193	$selected = "selected='selected'";
194	else
195	$selected = "";
	@@ -308,11 +300,10 @@ function wpsc_options_presentation() {
308	<?php
309	$list_view_quantity_value1 = '';
310	$list_view_quantity_value2 = '';
311	- if ( get_option( 'list_view_quantity' ) == 1 )
312	- $list_view_quantity_value1 = 'checked="checked"';
313	- else
314	- $list_view_quantity_value2 = 'checked="checked"';
315	-
316	?>
317	<th score="row">
318	<?php _e('Show Stock Availability','wpsc'); ?>
	@@ -512,7 +503,7 @@ function wpsc_options_presentation() {
512	echo "style='display:none;'";
513	} ?>>
514
515	- <input type='text' name='wpsc_options[grid_number_per_row]' id='grid_number_per_row' size='1' value='<?php ~~echo~~ get_option( 'grid_number_per_row' ); ?>' />
516	<label for='grid_number_per_row'><?php _e( 'Products Per Row', 'wpsc' ); ?></label><br />
517
518	<input type='hidden' value='0' name='wpsc_options[show_images_only]' />
	@@ -538,14 +529,11 @@ function wpsc_options_presentation() {
538	</td>
539	</tr>
540	<?php
541	- ~~if(get_option(~~'~~wpsc_display_categories~~'~~)){~~

542	$selected1 = 'checked="checked"';
543	- ~~$selected2 = '';~~
544	- }else{
545	- $selected1 = '';
546	$selected2 = 'checked="checked"';
547	- }
548	-
549	?>
550	<tr>
551	<th scope="row"><?php _e('Show list of categories','wpsc'); ?></th>
	@@ -992,8 +980,8 @@ function wpsc_options_presentation() {
992	<tr>
993	<th scope="row"><?php _e( 'Default Product Thumbnail Size', 'wpsc' ); ?>:</th>
994	<td>
995	- <?php _e( 'Width', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[product_image_width]' class='wpsc_prod_thumb_option' value='<?php ~~echo~~ get_option( 'product_image_width' ); ?>' />
996	- <?php _e( 'Height', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[product_image_height]' class='wpsc_prod_thumb_option' value='<?php ~~echo~~ get_option( 'product_image_height' ); ?>' />
997
998	</td>
999	</tr>
	@@ -1002,8 +990,8 @@ function wpsc_options_presentation() {
1002	<?php _e( 'Default Product Group Thumbnail Size', 'wpsc' ); ?>:
1003	</th>
1004	<td>
1005	- <?php _e( 'Width', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[category_image_width]' value='<?php ~~echo~~ get_option( 'category_image_width' ); ?>' />
1006	- <?php _e( 'Height', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[category_image_height]' value='<?php ~~echo~~ get_option( 'category_image_height' ); ?>' />
1007	</td>
1008	</tr>
1009	<tr>
	@@ -1011,8 +999,8 @@ function wpsc_options_presentation() {
1011	<?php _e( 'Single Product Image Size', 'wpsc' ); ?>:
1012	</th>
1013	<td>
1014	- <?php _e( 'Width', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[single_view_image_width]' value='<?php ~~echo~~ get_option( 'single_view_image_width' ); ?>' />
1015	- <?php _e( 'Height', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[single_view_image_height]' value='<?php ~~echo~~ get_option( 'single_view_image_height' ); ?>' />
1016	</td>
1017	</tr>
1018	<tr>
	@@ -1031,7 +1019,7 @@ function wpsc_options_presentation() {
1031	break;
1032	}
1033	?>
1034	- <?php _e( "Crop Thumbnails" ); ?>:
1035	</th>
1036	<td>
1037	<input type='radio' value='1' name='wpsc_options[wpsc_crop_thumbnails]' id='wpsc_crop_thumbnails1' <?php echo $crop1; ?> /> <label for='crop1'><?php _e( 'Yes', 'wpsc' ); ?></label>
	@@ -1132,11 +1120,11 @@ function wpsc_options_presentation() {
1132
1133	<tr>
1134	<th scope="row">
1135	- <?php _e( "Gallery Thumbnail Image Size" ); ?>:
1136	</th>
1137	<td>
1138	- <?php _e( '~~Height~~', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[~~wpsc_gallery_image_height~~]' value='<?php ~~echo~~ get_option( '~~wpsc_gallery_image_height~~' ); ?>' />
1139	- <?php _e( '~~Width~~', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[~~wpsc_gallery_image_width~~]' value='<?php ~~echo~~ get_option( '~~wpsc_gallery_image_width~~' ); ?>' ~~/> <~~br />
1140
1141	</td>
1142	</tr>
	@@ -1227,8 +1215,8 @@ function wpsc_options_presentation() {
1227	<input onclick='jQuery("#wpsc_enable_comments,.wpsc_comments_details").hide()' type='radio' value='0' name='wpsc_options[wpsc_enable_comments]' id='wpsc_enable_comments2' <?php echo $enable_comments2; ?> /> <label for='wpsc_enable_comments1'><?php _e( 'No', 'wpsc' ); ?></label><br />
1228	<div id='wpsc_enable_comments' <?php echo $intense_debate_account_id_display_state; ?> >
1229	<?php _e( 'IntenseDebate Account ID', 'wpsc' ); ?>:<br/>
1230	- <input type='text' size='30' name='wpsc_options[wpsc_intense_debate_account_id]' value='<?php ~~echo~~ get_option( 'wpsc_intense_debate_account_id' ); ?>' /><br/>
1231	- <small><a href='http://intensedebate.com/sitekey/' title='Help finding the Account ID'><?php _e( 'Help on finding the Account ID' ); ?></a></small>
1232	</div>
1233	</td>
1234	</tr>
	@@ -1244,10 +1232,10 @@ function wpsc_options_presentation() {
1244	<div class='wpsc_comments_details' <?php echo $intense_debate_account_id_display_state ?> >
1245	<input type='radio' value='1' name='wpsc_options[wpsc_comments_which_products]' id='wpsc_comments_which_products1' <?php if ( get_option( 'wpsc_comments_which_products' ) == 1 \|\| !get_option( 'wpsc_comments_which_products' ) ) {
1246	echo "checked='checked'";
1247	- } ?> /><label for='wpsc_comments_which_products1'>All Products</label>
1248	<input type='radio' value='2' name='wpsc_options[wpsc_comments_which_products]' id='wpsc_comments_which_products2' <?php if ( get_option( 'wpsc_comments_which_products' ) == 2 ) {
1249	echo "checked='checked'";
1250	- } ?> /><label for='wpsc_comments_which_products2'>Per Product</label>
1251	<br />
1252	</div>
1253	</td>


75	if ( isset( $_SESSION['wpsc_themes_backup'] ) && ($_SESSION['wpsc_themes_backup'] == true) ) {
76	?>
77	<div class="updated fade below-h2" id="message" style="background-color: rgb(255, 251, 204);">
78	+ <p><?php _e( "Thanks, you have made a succesful backup of your theme. It is located at the URL below. Please note each backup you create will replace your previous backups.", 'wpsc' ); ?></p>
79	<p>URL: <?php echo "/" . str_replace( ABSPATH, "", WPSC_THEME_BACKUP_DIR ); ?></p>
80	</div>
81	<?php

105	if(false !== array_search($file, (array)$themes_location))
106	$selected = 'checked="checked"';
107	?>
108	+ <li><input type='checkbox' id='<?php echo $id; ?>' <?php echo $selected; ?> value='<?php esc_attr_e( $file ); ?>' name='wpsc_templates_to_port[]' />
109	+ <label for='<?php echo $id; ?>'><?php esc_attr_e( $file ); ?></label></li>
110	<?php } ?>
111	</ul>
112	<p>

151	function options_categorylist() {
152	global $wpdb;
153
154	+ $current_default = esc_attr( get_option( 'wpsc_default_category' ) );
155	$group_data = get_terms( 'wpsc_product_category', 'hide_empty=0&parent=0' );
156	$categorylist = "<select name='wpsc_options[wpsc_default_category]'>";
157
158	+ if ( $current_default == 'all' )
159	$selected = "selected='selected'";
160	else
161	$selected = '';
162
163	$categorylist .= "<option value='all' " . $selected . " >" . __( 'Show All Products', 'wpsc' ) . "</option>";
164
165	+ if ( $current_default == 'list' )
166	$selected = "selected='selected'";
167	else
168	$selected = '';
169
170	$categorylist .= "<option value='list' " . $selected . " >" . __( 'Show list of product categories', 'wpsc' ) . "</option>";

171







172	$categorylist .= "<optgroup label='Product Categories'>";
173	foreach ( $group_data as $group ) {
174	$selected = "";
175	+ if ( $current_default == $group->term_id )
176	$selected = "selected='selected'";
177	else
178	$selected = "";

181	$category_data = get_terms( 'wpsc_product_category', 'hide_empty=0&parent=' . $group->term_id );
182	if ( $category_data != null ) {
183	foreach ( $category_data as $category ) {
184	+ if ( $current_default == $category->term_id )
185	$selected = "selected='selected'";
186	else
187	$selected = "";

300	<?php
301	$list_view_quantity_value1 = '';
302	$list_view_quantity_value2 = '';
303	+ if ( get_option( 'list_view_quantity' ) == 1 )
304	+ $list_view_quantity_value1 = 'checked="checked"';
305	+ else
306	+ $list_view_quantity_value2 = 'checked="checked"';

307	?>
308	<th score="row">
309	<?php _e('Show Stock Availability','wpsc'); ?>

503	echo "style='display:none;'";
504	} ?>>
505
506	+ <input type='text' name='wpsc_options[grid_number_per_row]' id='grid_number_per_row' size='1' value='<?php esc_attr_e( get_option( 'grid_number_per_row' ) ); ?>' />
507	<label for='grid_number_per_row'><?php _e( 'Products Per Row', 'wpsc' ); ?></label><br />
508
509	<input type='hidden' value='0' name='wpsc_options[show_images_only]' />

529	</td>
530	</tr>
531	<?php
532	+ $selected1 = $selected2 = '';
533	+ if(get_option('wpsc_display_categories'))
534	$selected1 = 'checked="checked"';
535	+ else


536	$selected2 = 'checked="checked"';


537	?>
538	<tr>
539	<th scope="row"><?php _e('Show list of categories','wpsc'); ?></th>

980	<tr>
981	<th scope="row"><?php _e( 'Default Product Thumbnail Size', 'wpsc' ); ?>:</th>
982	<td>
983	+ <?php _e( 'Width', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[product_image_width]' class='wpsc_prod_thumb_option' value='<?php esc_attr_e( get_option( 'product_image_width' ) ); ?>' />
984	+ <?php _e( 'Height', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[product_image_height]' class='wpsc_prod_thumb_option' value='<?php esc_attr_e( get_option( 'product_image_height' ) ); ?>' />
985
986	</td>
987	</tr>

990	<?php _e( 'Default Product Group Thumbnail Size', 'wpsc' ); ?>:
991	</th>
992	<td>
993	+ <?php _e( 'Width', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[category_image_width]' value='<?php esc_attr_e( get_option( 'category_image_width' ) ); ?>' />
994	+ <?php _e( 'Height', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[category_image_height]' value='<?php esc_attr_e( get_option( 'category_image_height' ) ); ?>' />
995	</td>
996	</tr>
997	<tr>

999	<?php _e( 'Single Product Image Size', 'wpsc' ); ?>:
1000	</th>
1001	<td>
1002	+ <?php _e( 'Width', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[single_view_image_width]' value='<?php esc_attr_e( get_option( 'single_view_image_width' ) ); ?>' />
1003	+ <?php _e( 'Height', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[single_view_image_height]' value='<?php esc_attr_e( get_option( 'single_view_image_height' ) ); ?>' />
1004	</td>
1005	</tr>
1006	<tr>

1019	break;
1020	}
1021	?>
1022	+ <?php _e( "Crop Thumbnails", 'wpsc' ); ?>:
1023	</th>
1024	<td>
1025	<input type='radio' value='1' name='wpsc_options[wpsc_crop_thumbnails]' id='wpsc_crop_thumbnails1' <?php echo $crop1; ?> /> <label for='crop1'><?php _e( 'Yes', 'wpsc' ); ?></label>

1120
1121	<tr>
1122	<th scope="row">
1123	+ <?php _e( "Gallery Thumbnail Image Size", 'wpsc' ); ?>:
1124	</th>
1125	<td>
1126	+ <?php _e( 'Width', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[wpsc_gallery_image_width]' value='<?php esc_attr_e( get_option( 'wpsc_gallery_image_width' ) ); ?>' />
1127	+ <?php _e( 'Height', 'wpsc' ); ?>:<input type='text' size='6' name='wpsc_options[wpsc_gallery_image_height]' value='<?php esc_attr_e( get_option( 'wpsc_gallery_image_height' ) ); ?>' /><br />
1128
1129	</td>
1130	</tr>

1215	<input onclick='jQuery("#wpsc_enable_comments,.wpsc_comments_details").hide()' type='radio' value='0' name='wpsc_options[wpsc_enable_comments]' id='wpsc_enable_comments2' <?php echo $enable_comments2; ?> /> <label for='wpsc_enable_comments1'><?php _e( 'No', 'wpsc' ); ?></label><br />
1216	<div id='wpsc_enable_comments' <?php echo $intense_debate_account_id_display_state; ?> >
1217	<?php _e( 'IntenseDebate Account ID', 'wpsc' ); ?>:<br/>
1218	+ <input type='text' size='30' name='wpsc_options[wpsc_intense_debate_account_id]' value='<?php esc_attr_e( get_option( 'wpsc_intense_debate_account_id' ) ); ?>' /><br/>
1219	+ <small><a href='http://intensedebate.com/sitekey/' title='Help finding the Account ID'><?php _e( 'Help on finding the Account ID', 'wpsc' ); ?></a></small>
1220	</div>
1221	</td>
1222	</tr>

1232	<div class='wpsc_comments_details' <?php echo $intense_debate_account_id_display_state ?> >
1233	<input type='radio' value='1' name='wpsc_options[wpsc_comments_which_products]' id='wpsc_comments_which_products1' <?php if ( get_option( 'wpsc_comments_which_products' ) == 1 \|\| !get_option( 'wpsc_comments_which_products' ) ) {
1234	echo "checked='checked'";
1235	+ } ?> /><label for='wpsc_comments_which_products1'><?php _e( 'All Products', 'wpsc' ); ?></label>
1236	<input type='radio' value='2' name='wpsc_options[wpsc_comments_which_products]' id='wpsc_comments_which_products2' <?php if ( get_option( 'wpsc_comments_which_products' ) == 2 ) {
1237	echo "checked='checked'";
1238	+ } ?> /><label for='wpsc_comments_which_products2'><?php _e( 'Per Product', 'wpsc' ); ?></label>
1239	<br />
1240	</div>
1241	</td>

wpsc-admin/includes/settings-pages/shipping.php CHANGED Viewed

	@@ -35,6 +35,12 @@ function wpsc_options_shipping() {
35	<input type='hidden' name='wpsc_admin_action' value='submit_options' />
36
37	<?php






38	if ( get_option( 'custom_gateway' ) == 1 ) {
39	$custom_gateway_hide = "style='display:block;'";
40	$custom_gateway1 = 'checked="checked"';
	@@ -42,6 +48,10 @@ function wpsc_options_shipping() {
42	$custom_gateway_hide = "style='display:none;'";
43	$custom_gateway2 = 'checked="checked"';
44	}




45	/* wpsc_setting_page_update_notification displays the wordpress styled notifications */
46	wpsc_settings_page_update_notification(); ?>
47	<div class='postbox'>
	@@ -72,14 +82,14 @@ function wpsc_options_shipping() {
72	<tr>
73	<th><?php _e( 'Base City:', 'wpsc' ); ?></th>
74	<td>
75	- <input type='text' name='wpsc_options[base_city]' value='<?php ~~echo~~ get_option( 'base_city' ); ?>' />
76	<br /><?php _e( 'Please provide for more accurate rates', 'wpsc' ); ?>
77	</td>
78	</tr>
79	<tr>
80	<th><?php _e( 'Base Zipcode/Postcode:', 'wpsc' ); ?></th>
81	<td>
82	- <input type='text' name='wpsc_options[base_zipcode]' value='<?php ~~echo~~ get_option( 'base_zipcode' ); ?>' />
83	<br /><?php _e( 'If you are based in America then you need to set your own Zipcode for UPS and USPS to work. This should be the Zipcode for your Base of Operations.', 'wpsc' ); ?>
84	</td>
85	</tr>
	@@ -108,8 +118,8 @@ function wpsc_options_shipping() {
108	<input type='radio' onclick='jQuery("#wpsc_shipwire_setting").show()' value='1' name='wpsc_options[shipwire]' id='shipwire1' <?php echo $shipwire1; ?> /> <label for='shipwire1'><?php _e( 'Yes', 'wpsc' ); ?></label>
109	<input type='radio' onclick='jQuery("#wpsc_shipwire_setting").hide()' value='0' name='wpsc_options[shipwire]' id='shipwire2' <?php echo $shipwire2; ?> /> <label for='shipwire2'><?php _e( 'No', 'wpsc' ); ?></label>
110	<?php
111	- $shipwireemail = get_option( "shipwireemail" );
112	- $shipwirepassword = get_option( "shipwirepassword" );
113	?>
114	<div id='wpsc_shipwire_setting' <?php echo $shipwire_settings; ?>>
115	<table>
	@@ -145,11 +155,11 @@ function wpsc_options_shipping() {
145	<td> </td>
146	<td colspan="2">
147	<?php
148	- $value = get_option( 'shipping_discount_value' );
149	?>
150	<div <?php echo $shipping_discount_settings; ?> id='shipping_discount_value'>
151
152	- Sales over or equal to: ~~<?php echo~~ $~~currency_sign; ?><~~input type='text' size='6' name='wpsc_options[shipping_discount_value]' value=~~'<?php echo~~ $~~value;~~ ~~?>'~~ id='shipping_discount_value' /> will receive free shipping.
153	</div>
154
155
	@@ -223,10 +233,10 @@ function wpsc_options_shipping() {
223	<div class='wpsc_shipping_options'>
224	<div class="wpsc-shipping-actions">
225	\| <span class="edit">
226	- <a class='edit-shippping-module' rel="<?php echo $shipping->internal_name; ?>" title="Edit this Shipping Module" href='<?php echo htmlspecialchars( add_query_arg('tab', 'shipping' , add_query_arg('page', 'wpsc-settings' , add_query_arg( 'shipping_module', $shipping->internal_name ) ) ) ); ?>#gateway_options' style="cursor:pointer;">Edit</a>
227	</span> \|
228	</div>
229	- <p><input <?php echo $disabled; ?> name='custom_shipping_options[]' <?php echo $shipping->checked; ?> type='checkbox' value='<?php echo $shipping->internal_name; ?>' id='<?php echo $shipping->internal_name; ?>_id' /><label for='<?php echo $shipping->internal_name; ?>_id'><?php ~~echo~~ $shipping->name; ?></label></p>
230	</div>
231	<?php } ?>
232
	@@ -241,23 +251,12 @@ function wpsc_options_shipping() {
241
242	<td class='gateway_settings' rowspan='2'>
243	<div class='postbox'>
244	- <?php
245	- if ( !isset( $_SESSION['previous_shipping_name'] ) )
246	- $_SESSION['previous_shipping_name'] = "";
247	-
248	- $shipping_data = wpsc_get_shipping_form( $_SESSION['previous_shipping_name'] );
249	- ?>
250	- <h3 class='hndle'><?php echo $shipping_data['name']; ?></h3>
251	<div class='inside'>
252	<table class='form-table'>
253	<?php echo $shipping_data['form_fields']; ?>
254	</table>
255	- ~~<?php~~
256	- if ( $shipping_data['has_submit_button'] == 0 )
257	- $update_button_css = 'style= "display: none;"';
258	- else
259	- $update_button_css = '';
260	- ?>
261	<div class='submit' <?php echo $update_button_css; ?>>
262	<input type='submit' value='<?php _e( 'Update »', 'wpsc' ); ?>' name='updateoption' />
263	</div>


35	<input type='hidden' name='wpsc_admin_action' value='submit_options' />
36
37	<?php
38	+
39	+ if ( !isset( $_SESSION['previous_shipping_name'] ) )
40	+ $_SESSION['previous_shipping_name'] = "";
41	+
42	+ $shipping_data = wpsc_get_shipping_form( $_SESSION['previous_shipping_name'] );
43	+
44	if ( get_option( 'custom_gateway' ) == 1 ) {
45	$custom_gateway_hide = "style='display:block;'";
46	$custom_gateway1 = 'checked="checked"';

48	$custom_gateway_hide = "style='display:none;'";
49	$custom_gateway2 = 'checked="checked"';
50	}
51	+ if ( $shipping_data['has_submit_button'] == 0 )
52	+ $update_button_css = 'style= "display: none;"';
53	+ else
54	+ $update_button_css = '';
55	/* wpsc_setting_page_update_notification displays the wordpress styled notifications */
56	wpsc_settings_page_update_notification(); ?>
57	<div class='postbox'>

82	<tr>
83	<th><?php _e( 'Base City:', 'wpsc' ); ?></th>
84	<td>
85	+ <input type='text' name='wpsc_options[base_city]' value='<?php esc_attr_e( get_option( 'base_city' ) ); ?>' />
86	<br /><?php _e( 'Please provide for more accurate rates', 'wpsc' ); ?>
87	</td>
88	</tr>
89	<tr>
90	<th><?php _e( 'Base Zipcode/Postcode:', 'wpsc' ); ?></th>
91	<td>
92	+ <input type='text' name='wpsc_options[base_zipcode]' value='<?php esc_attr_e( get_option( 'base_zipcode' ) ); ?>' />
93	<br /><?php _e( 'If you are based in America then you need to set your own Zipcode for UPS and USPS to work. This should be the Zipcode for your Base of Operations.', 'wpsc' ); ?>
94	</td>
95	</tr>

118	<input type='radio' onclick='jQuery("#wpsc_shipwire_setting").show()' value='1' name='wpsc_options[shipwire]' id='shipwire1' <?php echo $shipwire1; ?> /> <label for='shipwire1'><?php _e( 'Yes', 'wpsc' ); ?></label>
119	<input type='radio' onclick='jQuery("#wpsc_shipwire_setting").hide()' value='0' name='wpsc_options[shipwire]' id='shipwire2' <?php echo $shipwire2; ?> /> <label for='shipwire2'><?php _e( 'No', 'wpsc' ); ?></label>
120	<?php
121	+ $shipwireemail = esc_attr_e( get_option( "shipwireemail" ) );
122	+ $shipwirepassword = esc_attr_e( get_option( "shipwirepassword" ) );
123	?>
124	<div id='wpsc_shipwire_setting' <?php echo $shipwire_settings; ?>>
125	<table>

155	<td> </td>
156	<td colspan="2">
157	<?php
158	+ $value = esc_attr_e( get_option( 'shipping_discount_value' ) );
159	?>
160	<div <?php echo $shipping_discount_settings; ?> id='shipping_discount_value'>
161
162	+ <?php printf(__('Sales over or equal to: %1$s<input type="text" size="6" name="wpsc_options[shipping_discount_value]" value="%2$s" id="shipping_discount_value" /> will receive free shipping.', 'wpsc'), $currency_sign, $value ); ?>
163	</div>
164
165

233	<div class='wpsc_shipping_options'>
234	<div class="wpsc-shipping-actions">
235	\| <span class="edit">
236	+ <a class='edit-shippping-module' rel="<?php echo $shipping->internal_name; ?>" title="Edit this Shipping Module" href='<?php echo htmlspecialchars( add_query_arg('tab', 'shipping' , add_query_arg('page', 'wpsc-settings' , add_query_arg( 'shipping_module', $shipping->internal_name ) ) ) ); ?>#gateway_options' style="cursor:pointer;"><?php _e( 'Edit' , 'wpsc' ); ?></a>
237	</span> \|
238	</div>
239	+ <p><input <?php echo $disabled; ?> name='custom_shipping_options[]' <?php echo $shipping->checked; ?> type='checkbox' value='<?php echo $shipping->internal_name; ?>' id='<?php echo $shipping->internal_name; ?>_id' /><label for='<?php echo $shipping->internal_name; ?>_id'><?php esc_attr_e( $shipping->name ); ?></label></p>
240	</div>
241	<?php } ?>
242

251
252	<td class='gateway_settings' rowspan='2'>
253	<div class='postbox'>
254	+ <h3 class='hndle'><?php esc_html( $shipping_data['name'] ); ?></h3>






255	<div class='inside'>
256	<table class='form-table'>
257	<?php echo $shipping_data['form_fields']; ?>
258	</table>
259	+





260	<div class='submit' <?php echo $update_button_css; ?>>
261	<input type='submit' value='<?php _e( 'Update »', 'wpsc' ); ?>' name='updateoption' />
262	</div>

wpsc-admin/includes/settings-pages/taxes.php CHANGED Viewed

	@@ -9,13 +9,13 @@ function wpec_options_taxes() {
9	?>
10	<form name='wpec_taxes_options' id='wpec_taxes_options' method='post' action='' class='wpsc_form_track'>
11	<div class="wrap">
12	- <h3><?php _e( 'Tax Settings' ); ?></h3>
13	<p>
14	<label for='wpec_taxes_enabled'>
15	<input <?php if ( $wpec_taxes_options['wpec_taxes_enabled'] ) {
16	echo 'checked="checked"';
17	} ?> type="checkbox" id='wpec_taxes_enabled' name='wpsc_options[wpec_taxes_enabled]' />
18	- <?php _e( 'Turn tax on' ); ?>
19	</label>
20	</p>
21	<p>
	@@ -23,7 +23,7 @@ function wpec_options_taxes() {
23	<input <?php if ( $wpec_taxes_options['wpec_taxes_inprice'] == 'exclusive' ) {
24	echo 'checked="checked"';
25	} ?> type="radio" value='exclusive' id='wpec_taxes_inprice1' name='wpsc_options[wpec_taxes_inprice]' />
26	- <?php _e( 'Product prices are tax exclusive - add tax to the price during checkout' ); ?>
27	</label>
28	</p>
29	<p>
	@@ -31,16 +31,16 @@ function wpec_options_taxes() {
31	<input <?php if ( $wpec_taxes_options['wpec_taxes_inprice'] == 'inclusive' ) {
32	echo 'checked="checked"';
33	} ?> type="radio" value='inclusive' id='wpec_taxes_inprice2' name='wpsc_options[wpec_taxes_inprice]' />
34	- <?php _e( "Product prices are tax inclusive - during checkout the total price doesn't increase but tax is shown as a line item" ); ?>
35	</label>
36	</p>
37	- <h4><?php _e( 'Product Specific Tax' ); ?></h4>
38	<p>
39	<label for='wpec_taxes_product_1'>
40	<input <?php if ( $wpec_taxes_options['wpec_taxes_product'] == 'add' ) {
41	echo 'checked="checked"';
42	} ?> type="radio" value='add' id='wpec_taxes_product_1' name='wpsc_options[wpec_taxes_product]' />
43	- <?php _e( 'Add per product tax to tax percentage if product has a specific tax rate' ); ?>
44	</label>
45	</p>
46	<p>
	@@ -48,17 +48,17 @@ function wpec_options_taxes() {
48	<input <?php if ( $wpec_taxes_options['wpec_taxes_product'] == 'replace' ) {
49	echo 'checked="checked"';
50	} ?> type="radio" value='replace' id='wpec_taxes_product_2' name='wpsc_options[wpec_taxes_product]' />
51	- <?php _e( 'Replace tax percentage with product specific tax rate' ); ?>
52	</label>
53	</p>
54
55	- <h4><?php _e( 'Tax Logic' ); ?></h4>
56	<p>
57	<label for='wpec_taxes_logic_1'>
58	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'billing_shipping' ) {
59	echo 'checked="checked"';
60	} ?> type="radio" value='billing_shipping' id='wpec_taxes_logic_1' name='wpsc_options[wpec_taxes_logic]' />
61	- <?php _e( 'Apply tax when Billing and Shipping Country is the same as Tax Rate' ); ?>
62	</label>
63	<div id='billing_shipping_preference_container' style='margin-left: 20px;'>
64	<p>
	@@ -66,7 +66,7 @@ function wpec_options_taxes() {
66	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'billing_shipping' && $wpec_taxes_options['wpec_billing_shipping_preference'] == 'billing_address' ) {
67	echo 'checked="checked"';
68	} ?> type="radio" value='billing_address' id='wpec_billing_preference' name='wpsc_options[wpec_billing_shipping_preference]' />
69	- <?php _e( 'Apply tax to Billing Address' ); ?>
70	</label>
71	</p>
72	<p>
	@@ -74,7 +74,7 @@ function wpec_options_taxes() {
74	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'billing_shipping' && $wpec_taxes_options['wpec_billing_shipping_preference'] == 'shipping_address' ) {
75	echo 'checked="checked"';
76	} ?> type="radio" value='shipping_address' id='wpec_shipping_preference' name='wpsc_options[wpec_billing_shipping_preference]' />
77	- <?php _e( 'Apply tax to Shipping Address' ); ?>
78	</label>
79	</p>
80	</div>
	@@ -84,7 +84,7 @@ function wpec_options_taxes() {
84	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'billing' ) {
85	echo 'checked="checked"';
86	} ?> type="radio" value='billing' id='wpec_taxes_logic_2' name='wpsc_options[wpec_taxes_logic]' />
87	- <?php _e( 'Apply tax when Billing Country is the same as Tax Rate' ); ?>
88	</label>
89	</p>
90	<p>
	@@ -92,12 +92,12 @@ function wpec_options_taxes() {
92	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'shipping' ) {
93	echo 'checked="checked"';
94	} ?> type="radio" value='shipping' id='wpec_taxes_logic_3' name='wpsc_options[wpec_taxes_logic]' />
95	- <?php _e( 'Apply tax when Shipping Country is the same as Tax Rate' ); ?>
96	</label>
97	</p>
98	<div id='metabox-holder' class="metabox-holder">
99	<div id='wpec-taxes-rates-container' class='postbox'>
100	- <h3 class='hndle' style='cursor: default'><?php _e( 'Tax Rates' ); ?></h3>
101	<div id='wpec-taxes-rates' class='inside'>
102	<!--Start Taxes Output-->
103	<?php
	@@ -151,11 +151,11 @@ function wpec_options_taxes() {
151	<div id='wpec-taxes-bands' class='inside'>
152
153	<?php
154	- echo '<p>' . __( 'Note: Tax Bands are special tax rules you can create and apply on a per-product basis. <br /> Please visit the product page to apply your Tax Band.' ) . '</p>';
155
156	//echo message regarding inclusive tax
157	if ( !$wpec_taxes_controller->wpec_taxes_isincluded() ) {
158	- echo '<p>' . __( 'Note: Tax Bands do not take affect when product prices are tax exclusive.' ) . '</p>';
159	}// if
160
161	$tax_bands = $wpec_taxes_controller->wpec_taxes->wpec_taxes_get_bands();


9	?>
10	<form name='wpec_taxes_options' id='wpec_taxes_options' method='post' action='' class='wpsc_form_track'>
11	<div class="wrap">
12	+ <h3><?php _e( 'Tax Settings', 'wpsc' ); ?></h3>
13	<p>
14	<label for='wpec_taxes_enabled'>
15	<input <?php if ( $wpec_taxes_options['wpec_taxes_enabled'] ) {
16	echo 'checked="checked"';
17	} ?> type="checkbox" id='wpec_taxes_enabled' name='wpsc_options[wpec_taxes_enabled]' />
18	+ <?php _e( 'Turn tax on', 'wpsc' ); ?>
19	</label>
20	</p>
21	<p>

23	<input <?php if ( $wpec_taxes_options['wpec_taxes_inprice'] == 'exclusive' ) {
24	echo 'checked="checked"';
25	} ?> type="radio" value='exclusive' id='wpec_taxes_inprice1' name='wpsc_options[wpec_taxes_inprice]' />
26	+ <?php _e( 'Product prices are tax exclusive - add tax to the price during checkout', 'wpsc' ); ?>
27	</label>
28	</p>
29	<p>

31	<input <?php if ( $wpec_taxes_options['wpec_taxes_inprice'] == 'inclusive' ) {
32	echo 'checked="checked"';
33	} ?> type="radio" value='inclusive' id='wpec_taxes_inprice2' name='wpsc_options[wpec_taxes_inprice]' />
34	+ <?php _e( "Product prices are tax inclusive - during checkout the total price doesn't increase but tax is shown as a line item", 'wpsc' ); ?>
35	</label>
36	</p>
37	+ <h4><?php _e( 'Product Specific Tax', 'wpsc' ); ?></h4>
38	<p>
39	<label for='wpec_taxes_product_1'>
40	<input <?php if ( $wpec_taxes_options['wpec_taxes_product'] == 'add' ) {
41	echo 'checked="checked"';
42	} ?> type="radio" value='add' id='wpec_taxes_product_1' name='wpsc_options[wpec_taxes_product]' />
43	+ <?php _e( 'Add per product tax to tax percentage if product has a specific tax rate', 'wpsc' ); ?>
44	</label>
45	</p>
46	<p>

48	<input <?php if ( $wpec_taxes_options['wpec_taxes_product'] == 'replace' ) {
49	echo 'checked="checked"';
50	} ?> type="radio" value='replace' id='wpec_taxes_product_2' name='wpsc_options[wpec_taxes_product]' />
51	+ <?php _e( 'Replace tax percentage with product specific tax rate', 'wpsc' ); ?>
52	</label>
53	</p>
54
55	+ <h4><?php _e( 'Tax Logic', 'wpsc' ); ?></h4>
56	<p>
57	<label for='wpec_taxes_logic_1'>
58	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'billing_shipping' ) {
59	echo 'checked="checked"';
60	} ?> type="radio" value='billing_shipping' id='wpec_taxes_logic_1' name='wpsc_options[wpec_taxes_logic]' />
61	+ <?php _e( 'Apply tax when Billing and Shipping Country is the same as Tax Rate', 'wpsc' ); ?>
62	</label>
63	<div id='billing_shipping_preference_container' style='margin-left: 20px;'>
64	<p>

66	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'billing_shipping' && $wpec_taxes_options['wpec_billing_shipping_preference'] == 'billing_address' ) {
67	echo 'checked="checked"';
68	} ?> type="radio" value='billing_address' id='wpec_billing_preference' name='wpsc_options[wpec_billing_shipping_preference]' />
69	+ <?php _e( 'Apply tax to Billing Address', 'wpsc' ); ?>
70	</label>
71	</p>
72	<p>

74	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'billing_shipping' && $wpec_taxes_options['wpec_billing_shipping_preference'] == 'shipping_address' ) {
75	echo 'checked="checked"';
76	} ?> type="radio" value='shipping_address' id='wpec_shipping_preference' name='wpsc_options[wpec_billing_shipping_preference]' />
77	+ <?php _e( 'Apply tax to Shipping Address', 'wpsc' ); ?>
78	</label>
79	</p>
80	</div>

84	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'billing' ) {
85	echo 'checked="checked"';
86	} ?> type="radio" value='billing' id='wpec_taxes_logic_2' name='wpsc_options[wpec_taxes_logic]' />
87	+ <?php _e( 'Apply tax when Billing Country is the same as Tax Rate', 'wpsc' ); ?>
88	</label>
89	</p>
90	<p>

92	<input <?php if ( $wpec_taxes_options['wpec_taxes_logic'] == 'shipping' ) {
93	echo 'checked="checked"';
94	} ?> type="radio" value='shipping' id='wpec_taxes_logic_3' name='wpsc_options[wpec_taxes_logic]' />
95	+ <?php _e( 'Apply tax when Shipping Country is the same as Tax Rate', 'wpsc' ); ?>
96	</label>
97	</p>
98	<div id='metabox-holder' class="metabox-holder">
99	<div id='wpec-taxes-rates-container' class='postbox'>
100	+ <h3 class='hndle' style='cursor: default'><?php _e( 'Tax Rates', 'wpsc' ); ?></h3>
101	<div id='wpec-taxes-rates' class='inside'>
102	<!--Start Taxes Output-->
103	<?php

151	<div id='wpec-taxes-bands' class='inside'>
152
153	<?php
154	+ echo '<p>' . __( 'Note: Tax Bands are special tax rules you can create and apply on a per-product basis. <br /> Please visit the product page to apply your Tax Band.', 'wpsc' ) . '</p>';
155
156	//echo message regarding inclusive tax
157	if ( !$wpec_taxes_controller->wpec_taxes_isincluded() ) {
158	+ echo '<p>' . __( 'Note: Tax Bands do not take affect when product prices are tax exclusive.', 'wpsc' ) . '</p>';
159	}// if
160
161	$tax_bands = $wpec_taxes_controller->wpec_taxes->wpec_taxes_get_bands();

wpsc-admin/includes/updating-functions.php CHANGED Viewed

	@@ -13,7 +13,7 @@
13	* @return void
14	*/
15	function wpsc_convert_category_groups() {
16	- global $wpdb, $~~wp_rewrite, $~~user_ID;
17
18	//if they're updating from 3.6, and they've got categories with no group, let's fix that problem, eh?
19	$categorisation_groups = $wpdb->get_results("SELECT * FROM `".WPSC_TABLE_CATEGORISATION_GROUPS."` WHERE `active` IN ('1')");
	@@ -58,7 +58,7 @@ _get_term_hierarchy('wpsc_product_category');
58	* @return void
59	*/
60	function wpsc_convert_categories($new_parent_category, $group_id, $old_parent_category = 0) {
61	- global $wpdb, $~~wp_rewrite, $~~user_ID;
62
63	if($old_parent_category > 0) {
64	$categorisation = $wpdb->get_results("SELECT * FROM `".WPSC_TABLE_PRODUCT_CATEGORIES."` WHERE `active` IN ('1') AND `group_id` IN ('{$group_id}') AND `category_parent` IN ('{$old_parent_category}')");
	@@ -109,7 +109,7 @@ function wpsc_convert_categories($new_parent_category, $group_id, $old_parent_ca
109	}
110
111	function wpsc_convert_variation_sets() {
112	- global $wpdb, $~~wp_rewrite, $~~user_ID;
113	$variation_sets = $wpdb->get_results("SELECT * FROM `".WPSC_TABLE_PRODUCT_VARIATIONS."`");
114
115	foreach((array)$variation_sets as $variation_set) {
	@@ -153,7 +153,7 @@ function wpsc_convert_variation_sets() {
153	* @return void
154	*/
155	function wpsc_convert_products_to_posts() {
156	- global $wpdb, $~~wp_rewrite, $~~user_ID;
157	// Select all products
158
159	$product_data = $wpdb->get_results("SELECT `".WPSC_TABLE_PRODUCT_LIST."`. * , `".WPSC_TABLE_PRODUCT_ORDER."`.order FROM `".WPSC_TABLE_PRODUCT_LIST."` LEFT JOIN `".WPSC_TABLE_PRODUCT_ORDER."` ON `".WPSC_TABLE_PRODUCT_LIST."`.id = `".WPSC_TABLE_PRODUCT_ORDER."`.product_id WHERE `".WPSC_TABLE_PRODUCT_LIST."`.`active` IN ( '1' )
	@@ -228,7 +228,7 @@ GROUP BY ".WPSC_TABLE_PRODUCT_LIST.".id", ARRAY_A);
228	$post_data['_wpsc_product_metadata']['is_stock_limited'] = (int)(bool)$product['quantity_limited'];
229
230	// Product Weight
231	- $post_data['_wpsc_product_metadata']['weight'] = wpsc_convert_weight($product['weight'], $product['weight_unit'], "pound");
232	$post_data['_wpsc_product_metadata']['weight_unit'] = $product['weight_unit'];
233	$post_data['_wpsc_product_metadata']['display_weight_as'] = $product['weight_unit'];
234
	@@ -459,7 +459,7 @@ function wpsc_convert_variation_combinations() {
459	$post_data['_wpsc_original_variation_id'] = (float)$variation_item->id;
460
461	// Product Weight
462	- $post_data['_wpsc_product_metadata']['weight'] = wpsc_convert_weight($variation_item->weight, $variation_item->weight_unit, "pound");
463	$post_data['_wpsc_product_metadata']['display_weight_as'] = $variation_item->weight_unit;
464	$post_data['_wpsc_product_metadata']['weight_unit'] = $variation_item->weight_unit;
465
	@@ -529,7 +529,7 @@ function wpsc_update_files() {
529
530	$file_id = wpsc_get_meta($product_file->id, '_new_file_id', 'wpsc_files');
531
532	- if($file_id == null) {
533	$file_data = $attachment_template;
534	$file_data['post_parent'] = $product_post_id;
535	$new_file_id = wp_insert_post($file_data);


13	* @return void
14	*/
15	function wpsc_convert_category_groups() {
16	+ global $wpdb, $user_ID;
17
18	//if they're updating from 3.6, and they've got categories with no group, let's fix that problem, eh?
19	$categorisation_groups = $wpdb->get_results("SELECT * FROM `".WPSC_TABLE_CATEGORISATION_GROUPS."` WHERE `active` IN ('1')");

58	* @return void
59	*/
60	function wpsc_convert_categories($new_parent_category, $group_id, $old_parent_category = 0) {
61	+ global $wpdb, $user_ID;
62
63	if($old_parent_category > 0) {
64	$categorisation = $wpdb->get_results("SELECT * FROM `".WPSC_TABLE_PRODUCT_CATEGORIES."` WHERE `active` IN ('1') AND `group_id` IN ('{$group_id}') AND `category_parent` IN ('{$old_parent_category}')");

109	}
110
111	function wpsc_convert_variation_sets() {
112	+ global $wpdb, $user_ID;
113	$variation_sets = $wpdb->get_results("SELECT * FROM `".WPSC_TABLE_PRODUCT_VARIATIONS."`");
114
115	foreach((array)$variation_sets as $variation_set) {

153	* @return void
154	*/
155	function wpsc_convert_products_to_posts() {
156	+ global $wpdb, $user_ID;
157	// Select all products
158
159	$product_data = $wpdb->get_results("SELECT `".WPSC_TABLE_PRODUCT_LIST."`. * , `".WPSC_TABLE_PRODUCT_ORDER."`.order FROM `".WPSC_TABLE_PRODUCT_LIST."` LEFT JOIN `".WPSC_TABLE_PRODUCT_ORDER."` ON `".WPSC_TABLE_PRODUCT_LIST."`.id = `".WPSC_TABLE_PRODUCT_ORDER."`.product_id WHERE `".WPSC_TABLE_PRODUCT_LIST."`.`active` IN ( '1' )

228	$post_data['_wpsc_product_metadata']['is_stock_limited'] = (int)(bool)$product['quantity_limited'];
229
230	// Product Weight
231	+ $post_data['_wpsc_product_metadata']['weight'] = wpsc_convert_weight($product['weight'], $product['weight_unit'], "pound", true);
232	$post_data['_wpsc_product_metadata']['weight_unit'] = $product['weight_unit'];
233	$post_data['_wpsc_product_metadata']['display_weight_as'] = $product['weight_unit'];
234

459	$post_data['_wpsc_original_variation_id'] = (float)$variation_item->id;
460
461	// Product Weight
462	+ $post_data['_wpsc_product_metadata']['weight'] = wpsc_convert_weight($variation_item->weight, $variation_item->weight_unit, "pound", true);
463	$post_data['_wpsc_product_metadata']['display_weight_as'] = $variation_item->weight_unit;
464	$post_data['_wpsc_product_metadata']['weight_unit'] = $variation_item->weight_unit;
465

529
530	$file_id = wpsc_get_meta($product_file->id, '_new_file_id', 'wpsc_files');
531
532	+ if($file_id == null && count($variation_post_ids) == 0) {
533	$file_data = $attachment_template;
534	$file_data['post_parent'] = $product_post_id;
535	$new_file_id = wp_insert_post($file_data);

wpsc-admin/js/admin-legacy.js CHANGED Viewed

@@ -263,52 +263,6 @@ var getresults=function(results) {
+            		}
             		);
-            -
-            -
            	//SWFUpload
-            -
            	filesizeLimit = 5120000;
-            -
-            -
            	if (typeof SWFUpload != "undefined") {
-            -
            		var swfu = new SWFUpload({
-            -
            			flash_url : WPSC_CORE_JS_URL + '/swfupload.swf',
-            -
            			upload_url: base_url + '/?action=wpsc_add_image',
-            -
            			button_placeholder_id : "spanButtonPlaceholder",
-            -
            			button_width: 103,
-            -
            			button_height: 24,
-            -
            			button_window_mode: SWFUpload.WINDOW_MODE.TRANSPARENT,
-            -
            			button_cursor: SWFUpload.CURSOR.HAND,
-            -
            			post_params: {
-            -
            				"prodid" : jQuery('#prodid').val()
-            -
            				},
-            -
            			file_queue_limit : 1,
-            -
            			file_size_limit : filesizeLimit+'b',
-            -
            			file_types : "*.jpg;*.jpeg;*.png;*.gif;*.JPG;*.JPEG;*.PNG;*.GIF",
-            -
            			file_types_description : "Web-compatible Image Files",
-            -
            			file_upload_limit : filesizeLimit,
-            -
            			custom_settings : {
-            -
            				targetHolder : false,
-            -
            				progressBar : false,
-            -
            				sorting : false
-            -
            			},
-            -
            			debug: false,
-            -
-            -
            			file_queued_handler : imageFileQueued,
-            -
            			file_queue_error_handler : imageFileQueueError,
-            -
            			file_dialog_complete_handler : imageFileDialogComplete,
-            -
            			upload_start_handler : startImageUpload,
-            -
            			upload_progress_handler : imageUploadProgress,
-            -
            			upload_error_handler : imageUploadError,
-            -
            			upload_success_handler : imageUploadSuccess,
-            -
            			upload_complete_handler : imageUploadComplete,
-            -
            			queue_complete_handler : imageQueueComplete
-            -
            		});
-            -
            	}
-            -
-            -
            	jQuery("#add-product-image").click(function(){
-            -
            		swfu.selectFiles();
-            -
            	});
-            -
            	activate_resizable();
-            -
            	tb_init("a.thickbox");
-            -
             	jQuery("div.admin_product_name a.shorttag_toggle").toggle(
             		function () {
             			jQuery("div.admin_product_shorttags", jQuery(this).parent("div.admin_product_name")).css('display', 'block');

+            		}
             		);
             	jQuery("div.admin_product_name a.shorttag_toggle").toggle(
             		function () {
             			jQuery("div.admin_product_shorttags", jQuery(this).parent("div.admin_product_name")).css('display', 'block');

wpsc-admin/js/admin.js CHANGED Viewed

	@@ -374,7 +374,7 @@ jQuery(document).ready(function(){
374	post_values = "category_id="+category_id+"&"+product_order;
375	jQuery.post( 'index.php?wpsc_admin_action=save_product_order', post_values, function(returned_data) { });
376	},
377	- items: 'tr',
378	axis: 'y',
379	containment: 'table.widefat tbody',
380	placeholder: 'product-placeholder',
	@@ -509,6 +509,7 @@ jQuery(document).ready(function(){
509	jQuery('a.add_new_form_set').livequery(function(){
510	jQuery(this).click( function() {
511	jQuery(".add_new_form_set_forms").toggle();

512	});
513	});
514
	@@ -795,8 +796,7 @@ jQuery(document).ready(function(){
795	});
796
797	// Form change tracking code.
798	- jQuery('form.wpsc_form_track :input, form.wpsc_form_track ~~:radio~~, ~~form.wpsc_form_track~~ ~~:checkbox')~~
799	- .live('change', function() {
800	jQuery(this).parents('form.wpsc_form_track:first').addClass('wpsc_form_changed');
801	});
802
	@@ -974,12 +974,11 @@ function add_form_field() {
974	new_element_contents += "<td class='mandatorycol' style='text-align: center;'><input type='checkbox' name='new_form_mandatory["+new_element_number+"]' value='1' /></td>\n\r";
975	new_element_contents += "<td><a class='image_link' href='#' onclick='return remove_new_form_field(\""+new_element_id+"\");'><img src='" + WPSC_CORE_IMAGES_URL + "/trash.gif' alt='"+TXT_WPSC_DELETE+"' title='"+TXT_WPSC_DELETE+"' /></a></td>\n\r";
976	// new_element_contents += "</tr>";
977	-
978	- new_element = ~~document.createElement~~('tr');
979	- new_element.~~id = new_element_id~~;
980	- ~~document.getElementById~~("wpsc_checkout_list_body").~~appendChild~~(new_element);
981	- ~~document~~.~~getElementById~~(~~new_element_id~~)~~.innerHTML = new_element_contents~~;
982	- jQuery('#'+new_element_id).addClass('checkout_form_field');
983	return false;
984	}
985


374	post_values = "category_id="+category_id+"&"+product_order;
375	jQuery.post( 'index.php?wpsc_admin_action=save_product_order', post_values, function(returned_data) { });
376	},
377	+ items: 'tbody tr',
378	axis: 'y',
379	containment: 'table.widefat tbody',
380	placeholder: 'product-placeholder',

509	jQuery('a.add_new_form_set').livequery(function(){
510	jQuery(this).click( function() {
511	jQuery(".add_new_form_set_forms").toggle();
512	+ return false;
513	});
514	});
515

796	});
797
798	// Form change tracking code.
799	+ jQuery('form.wpsc_form_track input, form.wpsc_form_track textarea').live('change', function() {

800	jQuery(this).parents('form.wpsc_form_track:first').addClass('wpsc_form_changed');
801	});
802

974	new_element_contents += "<td class='mandatorycol' style='text-align: center;'><input type='checkbox' name='new_form_mandatory["+new_element_number+"]' value='1' /></td>\n\r";
975	new_element_contents += "<td><a class='image_link' href='#' onclick='return remove_new_form_field(\""+new_element_id+"\");'><img src='" + WPSC_CORE_IMAGES_URL + "/trash.gif' alt='"+TXT_WPSC_DELETE+"' title='"+TXT_WPSC_DELETE+"' /></a></td>\n\r";
976	// new_element_contents += "</tr>";
977	+
978	+ var new_element = jQuery('<tr id="'+new_element_id+'" />');
979	+ jQuery(new_element).html(new_element_contents);
980	+ jQuery("tbody#wpsc_checkout_list_body").append(new_element);
981	+ jQuery(new_element).addClass('checkout_form_field');

982	return false;
983	}
984

wpsc-core/js/tinymce3/window.php CHANGED Viewed

	@@ -61,7 +61,7 @@ global $wpdb;
61	echo "<option value=".$category->term_id." >".$category->name."</option>"."\n";
62	?>
63	</select><br />
64	- <span class="description"><?php _e('Select the category you would like to display with a Shortcode.') ?></span>
65	</td>
66	</tr>
67
	@@ -69,7 +69,7 @@ global $wpdb;
69	<td><strong><label for="wpsc_perpage"><?php _e("Number of products per Page: ", 'wpsc'); ?></label></strong></td>
70	<td>
71	<input name="number_per_page" id="wpsc_perpage" type="text" value="" style="width: 80px" /><br />
72	- <span class="description"><?php _e('Select the number of products you would like to display per page.') ?></span>
73	</td>
74	</tr>
75
	@@ -115,7 +115,7 @@ global $wpdb;
115	echo "<option value=".$category->term_id." >".$category->name."</option>"."\n";
116	?>
117	</select><br />
118	- <span class="description"><?php _e('Select the category you would like to display with a Shortcode.') ?></span>
119	</td>
120	</tr>
121
	@@ -142,7 +142,7 @@ global $wpdb;
142
143	<span class="description"> <?php
144	_e('<p> To create a preview on your restricted page put this shortcode at the top of your page. you can include html within this short code to display things like images ','wpsc'); ?></span>
145	- <code>[preview] Preview In Here [/preview]</code>
146
147	<?php }else{ ?>
148


61	echo "<option value=".$category->term_id." >".$category->name."</option>"."\n";
62	?>
63	</select><br />
64	+ <span class="description"><?php _e('Select the category you would like to display with a Shortcode.', 'wpsc') ?></span>
65	</td>
66	</tr>
67

69	<td><strong><label for="wpsc_perpage"><?php _e("Number of products per Page: ", 'wpsc'); ?></label></strong></td>
70	<td>
71	<input name="number_per_page" id="wpsc_perpage" type="text" value="" style="width: 80px" /><br />
72	+ <span class="description"><?php _e('Select the number of products you would like to display per page.', 'wpsc') ?></span>
73	</td>
74	</tr>
75

115	echo "<option value=".$category->term_id." >".$category->name."</option>"."\n";
116	?>
117	</select><br />
118	+ <span class="description"><?php _e('Select the category you would like to display with a Shortcode.', 'wpsc') ?></span>
119	</td>
120	</tr>
121

142
143	<span class="description"> <?php
144	_e('<p> To create a preview on your restricted page put this shortcode at the top of your page. you can include html within this short code to display things like images ','wpsc'); ?></span>
145	+ <code><?php _e('[preview] Preview In Here [/preview]', 'wpsc'); ?></code>
146
147	<?php }else{ ?>
148

wpsc-core/js/wp-e-commerce.js CHANGED Viewed

	@@ -105,7 +105,8 @@
105	);
106
107	for(var i in fields) {
108	- jQuery(fields[i][1]).val(jQuery(fields[i][0]).val())~~.parents('tr:first').hide();;~~

109	if(!jQuery(fields[i][0]).hasClass('intra-field-label'))
110	jQuery(fields[i][1]).removeClass('intra-field-label');
111	else
	@@ -130,7 +131,7 @@
130
131	jQuery('select[title="shippingcountry"]').change();
132	jQuery('select[title="shippingstate"]').change();
133	-
134	if( jQuery('#change_country #current_country').val() && ( (jQuery('select[title="billingcountry"]').val() && jQuery('#change_country #current_country').val() != jQuery('select[title="billingcountry"]').val() ) \|\| (jQuery('select[title="billingstate"]').val() && jQuery('select[title="billingstate"]').val() != jQuery('#change_country #region').val()) ) ){
135	jQuery('#change_country select').remove();
136	jQuery('#change_country').append('<input type="hidden" name="country" value="'+jQuery('select[title="billingcountry"]').val()+'" /><input type="hidden" name="region" value="'+jQuery('select[title="billingstate"]').val()+'" /><input type="hidden" name="shippingSameBilling" value="true" />').submit();
	@@ -237,19 +238,21 @@ jQuery(document).ready(function () {
237	jQuery("div#stock_display_"+product_id).html(variation_msg);
238
239	}
240	- ~~target_id~~ = ~~"product_price_"+product_id;~~
241	- ~~second_target_id~~ = "~~donation_price_~~"+product_id;
242	- ~~third_target_id~~ = "~~old_product_price_~~"+product_id;
243	- ~~yousave_target_id~~ = "~~yousave_~~"+product_id;
244	- ~~buynow_id~~ = "~~BB_BuyButtonForm~~"+product_id;
245	- ~~if(jQuery(~~"~~input#~~"+~~target_id).attr('type') == 'text') {~~
246	- jQuery("input#"+target_id).~~val~~(~~numeric_price~~);
247	- ~~} else {~~
248	- ~~jQuery("#"+target_id+".pricedisplay").html(price);~~
249	- jQuery("#"+~~third_target_id~~).html(~~old_price~~);
250	- jQuery("#"+~~yousave_target_id~~).html(~~you_save~~);



251	}
252	- jQuery("input#"+second_target_id).val(numeric_price);
253	}
254	});
255	return false;
	@@ -392,6 +395,10 @@ function set_billing_country(html_form_id, form_id){
392	form_values = "wpsc_ajax_action=change_tax&form_id="+form_id+"&billing_country="+country+billing_region;
393	jQuery.post( 'index.php', form_values, function(returned_data) {
394	eval(returned_data);




395	});
396	}
397	function set_shipping_country(html_form_id, form_id){
	@@ -418,6 +425,7 @@ function set_shipping_country(html_form_id, form_id){
418	eval(returned_data);
419	if(jQuery("#shippingSameBilling").is(':checked')){
420	jQuery('.shipping_region').parent().parent().hide();

421	}
422	});
423


105	);
106
107	for(var i in fields) {
108	+ jQuery(fields[i][1]).val(jQuery(fields[i][0]).val());
109	+ jQuery(fields[i][1]).parents('tr:first').hide();
110	if(!jQuery(fields[i][0]).hasClass('intra-field-label'))
111	jQuery(fields[i][1]).removeClass('intra-field-label');
112	else

131
132	jQuery('select[title="shippingcountry"]').change();
133	jQuery('select[title="shippingstate"]').change();
134	+
135	if( jQuery('#change_country #current_country').val() && ( (jQuery('select[title="billingcountry"]').val() && jQuery('#change_country #current_country').val() != jQuery('select[title="billingcountry"]').val() ) \|\| (jQuery('select[title="billingstate"]').val() && jQuery('select[title="billingstate"]').val() != jQuery('#change_country #region').val()) ) ){
136	jQuery('#change_country select').remove();
137	jQuery('#change_country').append('<input type="hidden" name="country" value="'+jQuery('select[title="billingcountry"]').val()+'" /><input type="hidden" name="region" value="'+jQuery('select[title="billingstate"]').val()+'" /><input type="hidden" name="shippingSameBilling" value="true" />').submit();

238	jQuery("div#stock_display_"+product_id).html(variation_msg);
239
240	}
241	+ if( typeof(price) !== 'undefined' && typeof(old_price) !== 'undefined' && typeof(you_save) !== 'undefined' && typeof(numeric_price) !== 'undefined' ) {
242	+ target_id = "product_price_"+product_id;
243	+ second_target_id = "donation_price_"+product_id;
244	+ third_target_id = "old_product_price_"+product_id;
245	+ yousave_target_id = "yousave_"+product_id;
246	+ buynow_id = "BB_BuyButtonForm"+product_id;
247	+ if(jQuery("input#"+target_id).attr('type') == 'text') {
248	+ jQuery("input#"+target_id).val(numeric_price);
249	+ } else {
250	+ jQuery("#"+target_id+".pricedisplay").html(price);
251	+ jQuery("#"+third_target_id).html(old_price);
252	+ jQuery("#"+yousave_target_id).html(you_save);
253	+ }
254	+ jQuery("input#"+second_target_id).val(numeric_price);
255	}

256	}
257	});
258	return false;

395	form_values = "wpsc_ajax_action=change_tax&form_id="+form_id+"&billing_country="+country+billing_region;
396	jQuery.post( 'index.php', form_values, function(returned_data) {
397	eval(returned_data);
398	+ if(jQuery("#shippingSameBilling").is(':checked')){
399	+ jQuery('.shipping_region').parent().parent().hide();
400	+ jQuery('.shipping_country_name').parent().parent().hide();
401	+ }
402	});
403	}
404	function set_shipping_country(html_form_id, form_id){

425	eval(returned_data);
426	if(jQuery("#shippingSameBilling").is(':checked')){
427	jQuery('.shipping_region').parent().parent().hide();
428	+ jQuery('.shipping_country_name').parent().parent().hide();
429	}
430	});
431

wpsc-core/wpsc-constants.php CHANGED Viewed

	@@ -28,7 +28,7 @@ function wpsc_core_constants() {
28	// Define Plugin version
29	define( 'WPSC_VERSION', '3.8' );
30	define( 'WPSC_MINOR_VERSION', ( '00000' . microtime( true ) ) );
31	- define( 'WPSC_PRESENTABLE_VERSION', '3.8 ~~Development~~' );
32
33	// Define Debug Variables for developers
34	define( 'WPSC_DEBUG', false );


28	// Define Plugin version
29	define( 'WPSC_VERSION', '3.8' );
30	define( 'WPSC_MINOR_VERSION', ( '00000' . microtime( true ) ) );
31	+ define( 'WPSC_PRESENTABLE_VERSION', '3.8 RC2' );
32
33	// Define Debug Variables for developers
34	define( 'WPSC_DEBUG', false );

wpsc-core/wpsc-deprecated.php CHANGED Viewed

@@ -316,96 +316,8 @@ function wpsc_last_products_link( $text = 'Last', $show_disabled = false ) {
              * @return nothing
              */
             function wpsc_save_variation_set() {
-            -
            	global $wpdb, $wp_rewrite;
-            -
-            -
-            -
-            -
            	/*  delete variation_value */
-            -
            	if($_GET['delete_value'] == 'true') {
-            -
            		if(is_numeric($_GET['value_id'])) {
-            -
            			$value_id = absint($_GET['value_id']);
-            -
            			check_admin_referer("delete-variation-$value_id");
-            -
-            -
            			$return_value = wp_delete_term($value_id, 'wpsc-variation');
-            -
            			if($_POST['ajax'] == 'true') {
-            -
            				echo (string)$value_id;
-            -
            				exit();
-            -
            			}
-            -
            		}
-            -
            	}
-            -
-            -
            	if(($_POST['submit_action'] == "add") || ($_POST['submit_action'] == "edit")) {
-            -
            		check_admin_referer('edit-variation', 'wpsc-edit-variation');
-            -
-            -
            		/* add variation */
-            -
            		if($_POST['submit_action'] == "add") {
-            -
            			$name = $_POST['name'];
-            -
            			$term = get_term_by('name', $name, 'wpsc-variation', ARRAY_A);
-            -
            			if(empty($term)) {
-            -
            				$term = wp_insert_term( $name, 'wpsc-variation',array('parent' => 0));
-            -
            			}
-            -
-            -
            		    if(!empty($term)) {
-            -
            				$variation_id = $term['term_id'];
-            -
            				$variation_values = $_POST['new_variation_values'];
-            -
            				$variation_value_sql_items = array();
-            -
            				foreach($variation_values as $variation_value) {
-            -
            					$term = get_term_by('name', $variation_value, 'wpsc-variation', ARRAY_A);
-            -
            					if(empty($term)) {
-            -
            						$term = wp_insert_term( $variation_value, 'wpsc-variation',array('parent' => $variation_id));
-            -
            					}
-            -
            				}
-            -
            			}
-            -
            		}
-            -
-            -
            		/* edit variation */
-            -
            		if(($_POST['submit_action'] == "edit") && is_numeric($_POST['variation_id'])) {
-            -
            			$variation_id = absint($_POST['variation_id']);
-            -
-            -
            			$variation_set_name = $_POST['name'];
-            -
            			$term = get_term_by('name', $name, 'wpsc-variation', ARRAY_A);
-            -
            			if(empty($term)) {
-            -
            				$term = wp_insert_term( $name, 'wpsc-variation',array('parent' => 0));
-            -
            			} else {
-            -
            				wp_update_term($variation_id, 'wpsc-variation', array(
-            -
            					'name' => $variation_set_name
-            -
            				));
-            -
            			}
-            -
-            -
            			foreach($_POST['variation_values'] as $variation_value_id => $variation_value_name) {
-            -
            				if(is_numeric($variation_value_id)) {
-            -
            					$variation_value_id = absint($variation_value_id);
-            -
            					wp_update_term($variation_value_id, 'wpsc-variation', array(
-            -
            						'name' => $variation_value_name
-            -
            					));
-            -
            				}
-            -
-            -
            				if($variation_value_state != $variation_value) {
-            -
            				}
-            -
            			}
-            -
-            -
            			if($_POST['new_variation_values'] != null) {
-            -
            				foreach($_POST['new_variation_values'] as $variation_value) {
-            -
            					$term = get_term_by('name', $variation_value, 'wpsc-variation', ARRAY_A);
-            -
            					if(empty($term)) {
-            -
            						$term = wp_insert_term( $variation_value, 'wpsc-variation',array('parent' => $variation_id));
-            -
            					}
-            -
            				}
-            -
            			}
-            -
            		}
-            -
            	}
-            -
            	$sendback = remove_query_arg(array(
-            -
            		'wpsc_admin_action',
-            -
            		'delete_value',
-            -
            		'_wpnonce',
-            -
            		'value_id'
-            -
            	));
-            -
-            -
            	if($_GET['page'] == null) {
-            -
            		$sendback = add_query_arg('page', 'wpsc-edit-variations', $sendback);
-            -
            	}
-            -
            	$sendback = add_query_arg('message', 1, $sendback);
-            -
            	wp_redirect($sendback);
+            }
             /**
@@ -435,4 +347,31 @@ function wpsc_page_number() {
             	return false;
+            }
             ?>

              * @return nothing
              */
             function wpsc_save_variation_set() {
+            +
            	_deprecated_function( __FUNCTION__, '3.8');
+            +
            	return false;
+            }
             /**
             	return false;
+            }
+            +
            function wpsc_ordersummary() {
+            +
            	_deprecated_function( __FUNCTION__, '3.8');
+            +
            	return false;
+            +
            }
+            +
+            +
            function display_ecomm_rss_feed() {
+            +
            	_deprecated_function( __FUNCTION__, '3.8');
+            +
            	return false;
+            +
            }
+            +
+            +
            function display_ecomm_admin_menu() {
+            +
            	_deprecated_function( __FUNCTION__, '3.8');
+            +
            	return false;
+            +
            }
+            +
+            +
            // displays error messages if the category setup is odd in some way
+            +
            // needs to be in a function because there are at least three places where this code must be used.
+            +
            function wpsc_odd_category_setup() {
+            +
            	_deprecated_function( __FUNCTION__, '3.8');
+            +
            	return false;
+            +
            }
+            +
+            +
            function wpsc_product_image_html( $image_name, $product_id ) {
+            +
            	_deprecated_function( __FUNCTION__, '3.8');
+            +
            	return false;
+            +
            }
+            +
             ?>

wpsc-core/wpsc-functions.php CHANGED Viewed

	@@ -272,10 +272,9 @@ add_action( 'rdf_item', 'wpsc_add_product_price_to_rss' );
272	* The meat of this whole operation, this is where we register our post types
273	*
274	* @global array $wpsc_page_titles
275	- * @global object $wp_rewrite
276	*/
277	function wpsc_register_post_types() {
278	- global $wpsc_page_titles~~, $wp_rewrite~~;
279	$labels = array(
280	'name' => _x( 'Products', 'post type name', 'wpsc' ),
281	'singular_name' => _x( 'Product', 'post type singular name', 'wpsc' ),
	@@ -330,7 +329,7 @@ function wpsc_register_post_types() {
330	'hierarchical' => false,
331	'labels' => $labels,
332	'rewrite' => array(
333	- 'slug' => '/tagged',
334	'with_front' => false )
335	) );
336
	@@ -364,7 +363,7 @@ function wpsc_register_post_types() {
364	'parent_item_colon' => __( 'Parent Variations:', 'wpsc' ),
365	'edit_item' => __( 'Edit Variation', 'wpsc' ),
366	'update_item' => __( 'Update Variation', 'wpsc' ),
367	- 'add_new_item' => __( 'Add New Variation', 'wpsc' ),
368	'new_item_name' => __( 'New Variation Name', 'wpsc' ),
369	);
370
	@@ -415,14 +414,32 @@ add_action( 'shutdown', 'wpsc_serialize_shopping_cart' );
415	* wpsc_start_the_query
416	*/
417	function wpsc_start_the_query() {
418	- global $wp_query, $wpsc_query, $wpsc_query_vars;
419	- ~~if ( null ==~~ $~~wpsc_query~~ ) {
420	-















421	if ( count( $wpsc_query_vars ) <= 1 ) {
422	$wpsc_query_vars = array(

423	'post_parent' => 0,
424	'order' => apply_filters('wpsc_product_order','ASC')
425	);


426
427	if( isset( $_GET['product_order'] ) )
428	$wpsc_query_vars['order'] = $_GET['product_order'];
	@@ -443,11 +460,14 @@ function wpsc_start_the_query() {
443	}
444	if(1 == get_option('use_pagination')){
445	$wpsc_query_vars['nopaging'] = false;

446	$wpsc_query_vars['posts_per_page'] = get_option('wpsc_products_per_page');
447	$wpsc_query_vars['paged'] = get_query_var('paged');
448	- if(empty($wpsc_query_vars['paged']))
449	$wpsc_query_vars['paged'] = get_query_var('page');
450	-


451	}
452	$orderby = get_option( 'wpsc_sort_by' );
453	if( isset( $_GET['product_order'] ) )
	@@ -465,6 +485,8 @@ function wpsc_start_the_query() {
465
466	//This only works in WP 3.0.
467	case "price":


468	$wpsc_query_vars["meta_key"] = '_wpsc_price';
469	$wpsc_query_vars["orderby"] = 'meta_value_num';
470	break;
	@@ -475,24 +497,35 @@ function wpsc_start_the_query() {
475	}
476
477	add_filter( 'pre_get_posts', 'wpsc_generate_product_query', 11 );

478	$wpsc_query = new WP_Query( $wpsc_query_vars );
479	//for 3.1 :\|
480	if(empty($wpsc_query->posts) && isset($wpsc_query->tax_query) && isset($wp_query->query_vars['wpsc_product_category'])){
481	$wpsc_query_vars = array();
482	$wpsc_query_vars['wpsc_product_category'] = $wp_query->query_vars['wpsc_product_category'];
483	if(1 == get_option('use_pagination')){
484	- $wpsc_query_vars['nopaging'] = false;
485	$wpsc_query_vars['posts_per_page'] = get_option('wpsc_products_per_page');
486	$wpsc_query_vars['paged'] = get_query_var('paged');
487	if(empty($wpsc_query_vars['paged']))
488	$wpsc_query_vars['paged'] = get_query_var('page');
489	}
490	$wpsc_query = new WP_Query( $wpsc_query_vars );


491	}
492	}
493	}
494	- ~~if($wp_query->is_404 && $wpsc_query->post_count > 0 )~~
495	- $~~wp_query~~ = $wpsc_query;









496	if ( isset( $wp_query->post->ID ) )
497	$post_id = $wp_query->post->ID;
498	else
	@@ -503,6 +536,28 @@ function wpsc_start_the_query() {
503	}
504	add_action( 'template_redirect', 'wpsc_start_the_query', 8 );
505






















506	/**
507	* wpsc_taxonomy_rewrite_rules function.
508	* Adds in new rewrite rules for categories, products, category pages, and ambiguities (either categories or products)
	@@ -764,7 +819,7 @@ class wpsc_products_by_category {
764	if ( ('' != $q['wpsc_product_category']) && !$query->is_singular ) {
765	$q['taxonomy'] = 'wpsc_product_category';
766	$q['term'] = $q['wpsc_product_category'];
767	-
768	$join = " INNER JOIN $wpdb->term_relationships
769	ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)
770	INNER JOIN $wpdb->term_taxonomy
	@@ -772,23 +827,38 @@ class wpsc_products_by_category {
772	";
773	if(isset($q['meta_key']))
774	$join .= " INNER JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) ";

775	$whichcat = " AND $wpdb->term_taxonomy.taxonomy = '{$q['taxonomy']}' ";
776
777	$term_data = get_term_by( 'slug', $q['term'], $q['taxonomy'] );
778	- ~~$in_cats = array( $term_data->term_id );~~
779	- if(~~'0'~~ != ~~get_option('show_subcatsprods_in_cat'~~)){



780	$term_children_data = get_term_children( $term_data->term_id, $q['taxonomy'] );
781	$in_cats = array_reverse( array_merge( $in_cats, $term_children_data ) );
782	}
783	- ~~$in_cats~~ ~~= "'" . implode~~( ~~"', '",~~ $in_cats ) ~~. "'";~~
784	- $~~whichcat~~ .= "~~AND~~ ~~$wpdb->term_taxonomy~~.~~term_id~~ IN ($in_cats)";




785	$groupby = "{$wpdb->posts}.ID";
786
787	$this->sql_components['join'] = $join;
788	- $this->sql_components['where'] = $whichcat;
789	$this->sql_components['fields'] = "{$wpdb->posts}.*, {$wpdb->term_taxonomy}.term_id";
790	- $this->sql_components['order_by'] = "{$wpdb->term_taxonomy}.term_id";
791	$this->sql_components['group_by'] = $groupby;









792	add_filter( 'posts_join', array( &$this, 'join_sql' ) );
793	add_filter( 'posts_where', array( &$this, 'where_sql' ) );
794	add_filter( 'posts_fields', array( &$this, 'fields_sql' ) );
	@@ -1128,7 +1198,4 @@ if ( is_ssl() ) {
1128	add_filter( 'option_transact_url', 'wpsc_add_https_to_page_url_options' );
1129	add_filter( 'option_user_account_url', 'wpsc_add_https_to_page_url_options' );
1130	}
1131	-
1132	-
1133	-
1134	- ?>


272	* The meat of this whole operation, this is where we register our post types
273	*
274	* @global array $wpsc_page_titles

275	*/
276	function wpsc_register_post_types() {
277	+ global $wpsc_page_titles;
278	$labels = array(
279	'name' => _x( 'Products', 'post type name', 'wpsc' ),
280	'singular_name' => _x( 'Product', 'post type singular name', 'wpsc' ),

329	'hierarchical' => false,
330	'labels' => $labels,
331	'rewrite' => array(
332	+ 'slug' => '/' . sanitize_title_with_dashes( _x( 'tagged', 'slug, part of url', 'wpsc' ) ),
333	'with_front' => false )
334	) );
335

363	'parent_item_colon' => __( 'Parent Variations:', 'wpsc' ),
364	'edit_item' => __( 'Edit Variation', 'wpsc' ),
365	'update_item' => __( 'Update Variation', 'wpsc' ),
366	+ 'add_new_item' => __( 'Add New Variation/Set', 'wpsc' ),
367	'new_item_name' => __( 'New Variation Name', 'wpsc' ),
368	);
369

414	* wpsc_start_the_query
415	*/
416	function wpsc_start_the_query() {
417	+ global $wpsc_page_titles, $wp_query, $wpsc_query, $wpsc_query_vars;
418	+ $is_404 = false;
419	+ if(isset($wp_query->query_vars['term']) && in_array($wp_query->query_vars['term'], $wpsc_page_titles)){
420	+ $wp_query = new WP_Query( 'pagename='.$wpsc_page_titles['products'].'/'.$wp_query->query_vars['term'] );
421	+
422	+ }elseif ( null == $wpsc_query ) {
423	+ if( ( $wp_query->is_404 && !empty($wp_query->query_vars['paged']) ) \|\| (isset( $wp_query->query['pagename']) && strpos( $wp_query->query['pagename'] , $wpsc_page_titles['products'] ) !== false ) && !isset($wp_query->post)){
424	+ //what was this for?
425	+ global $post;
426	+ $is_404 = true;
427	+ if( !isset( $wp_query->query_vars['wpsc_product_category'] ) )
428	+ $wp_query = new WP_Query('post_type=wpsc-product&name='.$wp_query->query_vars['name']);
429	+
430	+ if(isset($wp_query->post->ID))
431	+ $post = $wp_query->post;
432	+ else
433	+ $wpsc_query_vars['wpsc_product_category'] = $wp_query->query_vars['name'];
434	+ }
435	if ( count( $wpsc_query_vars ) <= 1 ) {
436	$wpsc_query_vars = array(
437	+ 'post_status' => 'publish, locked, private',
438	'post_parent' => 0,
439	'order' => apply_filters('wpsc_product_order','ASC')
440	);
441	+ if($wp_query->query_vars['preview'])
442	+ $wpsc_query_vars['post_status'] = 'any';
443
444	if( isset( $_GET['product_order'] ) )
445	$wpsc_query_vars['order'] = $_GET['product_order'];

460	}
461	if(1 == get_option('use_pagination')){
462	$wpsc_query_vars['nopaging'] = false;
463	+
464	$wpsc_query_vars['posts_per_page'] = get_option('wpsc_products_per_page');
465	$wpsc_query_vars['paged'] = get_query_var('paged');
466	+ if(isset($wpsc_query_vars['paged']) && empty($wpsc_query_vars['paged'])){
467	$wpsc_query_vars['paged'] = get_query_var('page');
468	+
469	+ }
470	+
471	}
472	$orderby = get_option( 'wpsc_sort_by' );
473	if( isset( $_GET['product_order'] ) )

485
486	//This only works in WP 3.0.
487	case "price":
488	+ add_filter( 'posts_join', 'wpsc_add_meta_table' );
489	+ add_filter( 'posts_where', 'wpsc_add_meta_table_where' );
490	$wpsc_query_vars["meta_key"] = '_wpsc_price';
491	$wpsc_query_vars["orderby"] = 'meta_value_num';
492	break;

497	}
498
499	add_filter( 'pre_get_posts', 'wpsc_generate_product_query', 11 );
500	+
501	$wpsc_query = new WP_Query( $wpsc_query_vars );
502	//for 3.1 :\|
503	if(empty($wpsc_query->posts) && isset($wpsc_query->tax_query) && isset($wp_query->query_vars['wpsc_product_category'])){
504	$wpsc_query_vars = array();
505	$wpsc_query_vars['wpsc_product_category'] = $wp_query->query_vars['wpsc_product_category'];
506	if(1 == get_option('use_pagination')){

507	$wpsc_query_vars['posts_per_page'] = get_option('wpsc_products_per_page');
508	$wpsc_query_vars['paged'] = get_query_var('paged');
509	if(empty($wpsc_query_vars['paged']))
510	$wpsc_query_vars['paged'] = get_query_var('page');
511	}
512	$wpsc_query = new WP_Query( $wpsc_query_vars );
513	+
514	+
515	}
516	}
517	}
518	+
519	+ if( $is_404 \|\| ( ( isset($wpsc_query->post_count) && $wpsc_query->post_count == 0 ) && isset($wpsc_query_vars['wpsc_product_category'] ) )){
520	+
521	+ $args = array_merge($wp_query->query, array('posts_per_page' => get_option('wpsc_products_per_page')));
522	+ $wp_query = new WP_Query($args);
523	+
524	+ if( empty( $wp_query->posts ) ){
525	+ $product_page_id = wpec_get_the_post_id_by_shortcode('[productspage]');
526	+ $wp_query = new WP_Query( 'page_id='.$product_page_id);
527	+ }
528	+ }
529	if ( isset( $wp_query->post->ID ) )
530	$post_id = $wp_query->post->ID;
531	else

536	}
537	add_action( 'template_redirect', 'wpsc_start_the_query', 8 );
538
539	+ /**
540	+ * add meta table where section for ordering by price
541	+ *
542	+ */
543	+ function wpsc_add_meta_table_where($where){
544	+ global $wpdb;
545	+
546	+ remove_filter( 'posts_where', 'wpsc_add_meta_table_where' );
547	+
548	+ return $where . ' AND ' . $wpdb->postmeta . '.meta_key = "_wpsc_price"';
549	+ }
550	+
551	+ /**
552	+ * add meta table join section for ordering by price
553	+ *
554	+ */
555	+ function wpsc_add_meta_table($join){
556	+ global $wpdb;
557	+ remove_filter( 'posts_join', 'wpsc_add_meta_table' );
558	+ return $join . ' JOIN ' . $wpdb->postmeta . ' ON ' . $wpdb->posts. '.ID = ' . $wpdb->postmeta . '.post_id';
559	+ }
560	+
561	/**
562	* wpsc_taxonomy_rewrite_rules function.
563	* Adds in new rewrite rules for categories, products, category pages, and ambiguities (either categories or products)

819	if ( ('' != $q['wpsc_product_category']) && !$query->is_singular ) {
820	$q['taxonomy'] = 'wpsc_product_category';
821	$q['term'] = $q['wpsc_product_category'];
822	+ $in_cats = '';
823	$join = " INNER JOIN $wpdb->term_relationships
824	ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)
825	INNER JOIN $wpdb->term_taxonomy

827	";
828	if(isset($q['meta_key']))
829	$join .= " INNER JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) ";
830	+
831	$whichcat = " AND $wpdb->term_taxonomy.taxonomy = '{$q['taxonomy']}' ";
832
833	$term_data = get_term_by( 'slug', $q['term'], $q['taxonomy'] );
834	+
835	+ if( is_object( $term_data ) )
836	+ $in_cats = array( $term_data->term_id );
837	+
838	+ if('0' != get_option('show_subcatsprods_in_cat') && is_object($term_data)){
839	$term_children_data = get_term_children( $term_data->term_id, $q['taxonomy'] );
840	$in_cats = array_reverse( array_merge( $in_cats, $term_children_data ) );
841	}
842	+ if( is_array( $in_cats ) ){
843	+ $in_cats = "'" . implode( "', '", $in_cats ) . "'";
844	+ $whichcat .= "AND $wpdb->term_taxonomy.term_id IN ($in_cats)";
845	+ }
846	+ $whichcat .= " AND $wpdb->posts.post_status IN ('publish', 'locked', 'private') ";
847	+
848	$groupby = "{$wpdb->posts}.ID";
849
850	$this->sql_components['join'] = $join;

851	$this->sql_components['fields'] = "{$wpdb->posts}.*, {$wpdb->term_taxonomy}.term_id";

852	$this->sql_components['group_by'] = $groupby;
853	+
854	+ //what about ordering by price
855	+ if(isset($q['meta_key']) && '_wpsc_price' == $q['meta_key']){
856	+ $whichcat .= " AND $wpdb->postmeta.meta_key = '_wpsc_price'";
857	+ }else{
858	+
859	+ $this->sql_components['order_by'] = "{$wpdb->term_taxonomy}.term_id";
860	+ }
861	+ $this->sql_components['where'] = $whichcat;
862	add_filter( 'posts_join', array( &$this, 'join_sql' ) );
863	add_filter( 'posts_where', array( &$this, 'where_sql' ) );
864	add_filter( 'posts_fields', array( &$this, 'fields_sql' ) );

1198	add_filter( 'option_transact_url', 'wpsc_add_https_to_page_url_options' );
1199	add_filter( 'option_user_account_url', 'wpsc_add_https_to_page_url_options' );
1200	}
1201	+ ?>

wpsc-core/wpsc-includes.php CHANGED Viewed

	@@ -55,6 +55,9 @@ include_once( WPSC_FILE_PATH . '/wpsc-widgets/price_range_widget.php' );
55	include_once( WPSC_FILE_PATH . '/wpsc-widgets/admin_menu_widget.php' );
56	include_once( WPSC_FILE_PATH . '/wpsc-widgets/category_widget.php' );
57



58	// Admin
59	if ( is_admin() )
60	include_once( WPSC_FILE_PATH . '/wpsc-admin/admin.php' );


55	include_once( WPSC_FILE_PATH . '/wpsc-widgets/admin_menu_widget.php' );
56	include_once( WPSC_FILE_PATH . '/wpsc-widgets/category_widget.php' );
57
58	+ // Gregs ASH Shipping
59	+ require_once( WPSC_FILE_PATH . '/wpsc-includes/shipping.helper.php' );
60	+
61	// Admin
62	if ( is_admin() )
63	include_once( WPSC_FILE_PATH . '/wpsc-admin/admin.php' );

wpsc-core/wpsc-installer.php CHANGED Viewed

	@@ -182,6 +182,13 @@ function wpsc_install() {
182
183	add_option( 'wpsc_category_url_cache', array(), '', 'yes' );
184







185	wpsc_product_files_htaccess();
186
187	/*
	@@ -291,7 +298,7 @@ function wpsc_install() {
291	$wp_rewrite->flush_rules();
292	wpsc_update_categorymeta( $category_id, 'nice-name', $url_name );
293	wpsc_update_categorymeta( $category_id, 'description', __( "This is a description", 'wpsc' ) );
294	- wpsc_update_categorymeta( $category_id, 'image', ~~$image~~ );
295	wpsc_update_categorymeta( $category_id, 'fee', '0' );
296	wpsc_update_categorymeta( $category_id, 'active', '1' );
297	wpsc_update_categorymeta( $category_id, 'order', '0' );
	@@ -753,8 +760,6 @@ function wpsc_add_checkout_fields() {
753	( '" . __( 'Postal Code', 'wpsc' ) . "', 'text', '0', '0', '', '1', 17,'shippingpostcode');";
754
755	$wpdb->query( $sql );
756	- update_option( 'country_form_field', $country_form_id[0]['id'] );
757	- update_option( 'email_form_field', $email_form_id[0]['id'] );
758	$wpdb->query( "INSERT INTO `" . WPSC_TABLE_CHECKOUT_FORMS . "` ( `name`, `type`, `mandatory`, `display_log`, `default`, `active`, `checkout_order`, `unique_name` ) VALUES ( '" . __( 'Phone', 'wpsc' ) . "', 'text', '1', '0', '', '1', '8','billingphone');" );
759	}
760	}


182
183	add_option( 'wpsc_category_url_cache', array(), '', 'yes' );
184
185	+ // add in some default tax settings
186	+ add_option( 'wpec_taxes_inprice', 'exclusive' );
187	+
188	+ add_option( 'wpec_taxes_product', 'replace' );
189	+
190	+ add_option( 'wpec_taxes_logic', 'billing' );
191	+
192	wpsc_product_files_htaccess();
193
194	/*

298	$wp_rewrite->flush_rules();
299	wpsc_update_categorymeta( $category_id, 'nice-name', $url_name );
300	wpsc_update_categorymeta( $category_id, 'description', __( "This is a description", 'wpsc' ) );
301	+ wpsc_update_categorymeta( $category_id, 'image', '' );
302	wpsc_update_categorymeta( $category_id, 'fee', '0' );
303	wpsc_update_categorymeta( $category_id, 'active', '1' );
304	wpsc_update_categorymeta( $category_id, 'order', '0' );

760	( '" . __( 'Postal Code', 'wpsc' ) . "', 'text', '0', '0', '', '1', 17,'shippingpostcode');";
761
762	$wpdb->query( $sql );


763	$wpdb->query( "INSERT INTO `" . WPSC_TABLE_CHECKOUT_FORMS . "` ( `name`, `type`, `mandatory`, `display_log`, `default`, `active`, `checkout_order`, `unique_name` ) VALUES ( '" . __( 'Phone', 'wpsc' ) . "', 'text', '1', '0', '', '1', '8','billingphone');" );
764	}
765	}

wpsc-includes/ajax.functions.php CHANGED Viewed

	@@ -81,7 +81,8 @@ function wpsc_add_to_cart() {
81	if ( $parameters['quantity'] <= 0 ) {
82	$cart_messages[] = __( 'Sorry, but you cannot add zero items to your cart', 'wpsc' );
83	} else if ( $wpsc_cart->get_remaining_quantity( $product_id, $parameters['variation_values'], $parameters['quantity'] ) > 0 ) {
84	- $~~cart_messages[]~~ = ~~sprintf( __( 'Sorry, but there are only %s of this item in stock.', 'wpsc' ),~~ $wpsc_cart->get_remaining_quantity( $product_id, $parameters['variation_values'], $parameters['quantity'] ) );

85	} else {
86	$cart_messages[] = sprintf( __( 'Sorry, but the item "%s" is out of stock.', 'wpsc' ), $product->post_title );
87	}
	@@ -352,8 +353,8 @@ function wpsc_update_shipping_price() {
352	$quote_shipping_method = $_POST['key1'];
353	$quote_shipping_option = $_POST['key'];
354	$wpsc_cart->update_shipping( $quote_shipping_method, $quote_shipping_option );
355	- echo "jQuery('.pricedisplay.checkout-shipping').html('" . wpsc_cart_shipping() . "');\n\r";
356	- echo "jQuery('.pricedisplay.checkout-total').html('" . wpsc_cart_total() . "');\n\r";
357	exit();
358	}
359
	@@ -500,6 +501,9 @@ if ( isset( $_REQUEST['wpsc_action'] ) && ($_REQUEST['wpsc_action'] == 'cart_htm
500	*/
501	function wpsc_submit_checkout() {
502	global $wpdb, $wpsc_cart, $user_ID, $nzshpcrt_gateways, $wpsc_shipping_modules, $wpsc_gateways;



503	$_SESSION['wpsc_checkout_misc_error_messages'] = array( );
504	$wpsc_checkout = new wpsc_checkout();
505	$selected_gateways = get_option( 'custom_gateway_options' );
	@@ -546,7 +550,7 @@ function wpsc_submit_checkout() {
546
547	if ( (get_option( 'do_not_use_shipping' ) != 1) && (in_array( 'ups', (array)$options )) && $_SESSION['wpsc_zipcode'] == '' ) {
548	if ( $num_items != $disregard_shipping ) {
549	- $_SESSION['categoryAndShippingCountryConflict'] = __( 'Please enter a Zipcode and click calculate to proceed' );
550	$is_valid = false;
551	}
552	}
	@@ -613,7 +617,8 @@ function wpsc_submit_checkout() {
613	$wpsc_cart->submit_stock_claims( $purchase_log_id );
614	if ( get_option( 'wpsc_also_bought' ) == 1 )
615	wpsc_populate_also_bought_list();
616	-

617	$wpsc_cart->log_id = $purchase_log_id;
618	do_action( 'wpsc_submit_checkout', array( "purchase_log_id" => $purchase_log_id, "our_user_id" => $our_user_id ) );
619	if ( get_option( 'permalink_structure' ) != '' )
	@@ -649,10 +654,6 @@ if ( isset( $_REQUEST['wpsc_action'] ) && ($_REQUEST['wpsc_action'] == 'submit_c
649	add_action( 'init', 'wpsc_submit_checkout' );
650	}
651
652	- if ( isset( $_REQUEST['wpsc_action'] ) && ($_REQUEST['wpsc_action'] == 'gateway_notification') ) {
653	- add_action( 'init', 'wpsc_gateway_notification' );
654	- }
655	-
656	function wpsc_product_rss() {
657	global $wp_query,$wpsc_query, $wpdb;
658	list($wp_query, $wpsc_query) = array( $wpsc_query, $wp_query ); // swap the wpsc_query object
	@@ -775,7 +776,7 @@ function wpsc_change_tax() {
775
776
777	foreach ( $wpsc_cart->cart_items as $key => $cart_item ) {
778	- echo "jQuery('#shipping_$key').html(\"" . ~~$wpsc_cart->process_as_currency~~( $cart_item->shipping ) . "\");\n\r";
779	}
780
781	echo "jQuery('#checkout_shipping').html(\"" . wpsc_cart_shipping() . "\");\n\r";
	@@ -944,8 +945,7 @@ function wpsc_scale_image() {
944	add_action( 'init', 'wpsc_scale_image' );
945
946	function wpsc_download_file() {
947	- global $wpdb~~, $user_level, $wp_rewrite~~;
948	- get_currentuserinfo();
949
950	if ( isset( $_GET['downloadid'] ) ) {
951	// strip out anything that isnt 'a' to 'z' or '0' to '9'
	@@ -966,7 +966,7 @@ function wpsc_download_file() {
966	), array( 'id' => $download_data['id'] ) );
967	} else if ( $ip_number != $download_data['ip_number'] ) {
968	// if the IP number is set but does not match, fail here.
969	- exit( _e( 'This download is no longer valid, Please contact the site administrator for more information.' ) );
970	}
971	}
972
	@@ -983,7 +983,7 @@ function wpsc_download_file() {
983	}
984
985	if ( $file_data == null ) {
986	- exit( _e( 'This download is no longer valid, Please contact the site administrator for more information.' ) );
987	}
988
989	if ( $download_data != null ) {
	@@ -1056,7 +1056,7 @@ function wpsc_download_file() {
1056	exit();
1057	}
1058	} else {
1059	- exit( _e( 'This download is no longer valid, Please contact the site administrator for more information.' ) );
1060	}
1061	}
1062	}


81	if ( $parameters['quantity'] <= 0 ) {
82	$cart_messages[] = __( 'Sorry, but you cannot add zero items to your cart', 'wpsc' );
83	} else if ( $wpsc_cart->get_remaining_quantity( $product_id, $parameters['variation_values'], $parameters['quantity'] ) > 0 ) {
84	+ $quantity = $wpsc_cart->get_remaining_quantity( $product_id, $parameters['variation_values'], $parameters['quantity'] );
85	+ $cart_messages[] = sprintf( _n( 'Sorry, but there is only %s of this item in stock.', 'Sorry, but there are only %s of this item in stock.', $quantity, 'wpsc' ), $quantity );
86	} else {
87	$cart_messages[] = sprintf( __( 'Sorry, but the item "%s" is out of stock.', 'wpsc' ), $product->post_title );
88	}

353	$quote_shipping_method = $_POST['key1'];
354	$quote_shipping_option = $_POST['key'];
355	$wpsc_cart->update_shipping( $quote_shipping_method, $quote_shipping_option );
356	+ echo "jQuery('.pricedisplay.checkout-shipping').html(\"" . wpsc_cart_shipping() . "\");\n\r";
357	+ echo "jQuery('.pricedisplay.checkout-total').html(\"" . wpsc_cart_total() . "\");\n\r";
358	exit();
359	}
360

501	*/
502	function wpsc_submit_checkout() {
503	global $wpdb, $wpsc_cart, $user_ID, $nzshpcrt_gateways, $wpsc_shipping_modules, $wpsc_gateways;
504	+ $num_items = 0;
505	+ $use_shipping = 0;
506	+ $disregard_shipping = 0;
507	$_SESSION['wpsc_checkout_misc_error_messages'] = array( );
508	$wpsc_checkout = new wpsc_checkout();
509	$selected_gateways = get_option( 'custom_gateway_options' );

550
551	if ( (get_option( 'do_not_use_shipping' ) != 1) && (in_array( 'ups', (array)$options )) && $_SESSION['wpsc_zipcode'] == '' ) {
552	if ( $num_items != $disregard_shipping ) {
553	+ $_SESSION['categoryAndShippingCountryConflict'] = __( 'Please enter a Zipcode and click calculate to proceed', 'wpsc' );
554	$is_valid = false;
555	}
556	}

617	$wpsc_cart->submit_stock_claims( $purchase_log_id );
618	if ( get_option( 'wpsc_also_bought' ) == 1 )
619	wpsc_populate_also_bought_list();
620	+ if( !isset( $our_user_id ) && isset( $user_ID ))
621	+ $our_user_id = $user_ID;
622	$wpsc_cart->log_id = $purchase_log_id;
623	do_action( 'wpsc_submit_checkout', array( "purchase_log_id" => $purchase_log_id, "our_user_id" => $our_user_id ) );
624	if ( get_option( 'permalink_structure' ) != '' )

654	add_action( 'init', 'wpsc_submit_checkout' );
655	}
656




657	function wpsc_product_rss() {
658	global $wp_query,$wpsc_query, $wpdb;
659	list($wp_query, $wpsc_query) = array( $wpsc_query, $wp_query ); // swap the wpsc_query object

776
777
778	foreach ( $wpsc_cart->cart_items as $key => $cart_item ) {
779	+ echo "jQuery('#shipping_$key').html(\"" . wpsc_currency_display( $cart_item->shipping ) . "\");\n\r";
780	}
781
782	echo "jQuery('#checkout_shipping').html(\"" . wpsc_cart_shipping() . "\");\n\r";

945	add_action( 'init', 'wpsc_scale_image' );
946
947	function wpsc_download_file() {
948	+ global $wpdb;

949
950	if ( isset( $_GET['downloadid'] ) ) {
951	// strip out anything that isnt 'a' to 'z' or '0' to '9'

966	), array( 'id' => $download_data['id'] ) );
967	} else if ( $ip_number != $download_data['ip_number'] ) {
968	// if the IP number is set but does not match, fail here.
969	+ exit( _e( 'This download is no longer valid, Please contact the site administrator for more information.', 'wpsc' ) );
970	}
971	}
972

983	}
984
985	if ( $file_data == null ) {
986	+ exit( _e( 'This download is no longer valid, Please contact the site administrator for more information.', 'wpsc' ) );
987	}
988
989	if ( $download_data != null ) {

1056	exit();
1057	}
1058	} else {
1059	+ exit( _e( 'This download is no longer valid, Please contact the site administrator for more information.', 'wpsc' ) );
1060	}
1061	}
1062	}

wpsc-includes/breadcrumbs.class.php CHANGED Viewed

	@@ -136,13 +136,12 @@ class wpsc_breadcrumbs {
136	global $wp_query, $wpsc_query;
137	$this->breadcrumbs = array();
138	$query_data = Array();
139	- if ( isset($wp_query->query_vars['post_type']) && 'wpsc-product' == $wp_query->query_vars['post_type'] && 1 == $wp_query->query_vars['posts_per_page']) {
140	-
141	$query_data['product'] = $wp_query->post->post_title;
142	- }
143	- if ( !empty($wp_query->query_vars['term']) ) {
144	$query_data['category'] = $wp_query->query_vars['term'];
145	- }
146
147	if(!empty($query_data['product']) && !empty($wp_query->post)) {
148	$this->breadcrumbs[] = array(
	@@ -160,11 +159,11 @@ class wpsc_breadcrumbs {
160	$query_data['category'] = $categories[0]->slug;
161
162	}
163	- if(isset($query_data['category'])) {
164	$term_data = get_term_by('slug', $query_data['category'], 'wpsc_product_category');
165	- } else {
166	$term_data = get_term_by('slug', 'uncategorized', 'wpsc_product_category');
167	- }
168	if( $term_data != false) {
169	$this->breadcrumbs[] = array(
170	'name' => htmlentities( $term_data->name, ENT_QUOTES, 'UTF-8'),


136	global $wp_query, $wpsc_query;
137	$this->breadcrumbs = array();
138	$query_data = Array();
139	+ if ( isset($wp_query->query_vars['post_type']) && 'wpsc-product' == $wp_query->query_vars['post_type'] && 1 == $wp_query->query_vars['posts_per_page'] && isset($wp_query->post))

140	$query_data['product'] = $wp_query->post->post_title;
141	+
142	+ if ( !empty($wp_query->query_vars['term']) )
143	$query_data['category'] = $wp_query->query_vars['term'];
144	+
145
146	if(!empty($query_data['product']) && !empty($wp_query->post)) {
147	$this->breadcrumbs[] = array(

159	$query_data['category'] = $categories[0]->slug;
160
161	}
162	+ if( isset( $query_data['category'] ) )
163	$term_data = get_term_by('slug', $query_data['category'], 'wpsc_product_category');
164	+ else
165	$term_data = get_term_by('slug', 'uncategorized', 'wpsc_product_category');
166	+
167	if( $term_data != false) {
168	$this->breadcrumbs[] = array(
169	'name' => htmlentities( $term_data->name, ENT_QUOTES, 'UTF-8'),

wpsc-includes/cart.class.php CHANGED Viewed

	@@ -46,7 +46,7 @@ function wpsc_cart_item_count() {
46	function wpsc_coupon_amount($forDisplay=true) {
47	global $wpsc_cart;
48	if($forDisplay == true) {
49	- $output = ~~$wpsc_cart->process_as_currency~~($wpsc_cart->coupons_amount);
50	} else {
51	$output = $wpsc_cart->coupons_amount;
52	}
	@@ -71,7 +71,7 @@ function wpsc_cart_total($forDisplay=true) {
71	$total = 0;
72	}
73	if($forDisplay){
74	- return ~~$wpsc_cart->process_as_currency~~($total);
75	}else{
76	return $total;
77	}
	@@ -103,9 +103,9 @@ function wpsc_cart_total_widget( $shipping = true, $tax = true, $coupons = true
103	}
104
105	if ( get_option( 'add_plustax' ) == 1 ) {
106	- return ~~$wpsc_cart->process_as_currency~~( $wpsc_cart->calculate_subtotal() );
107	} else {
108	- return ~~$wpsc_cart->process_as_currency~~( $total );
109	}
110
111	}
	@@ -146,9 +146,9 @@ function wpsc_cart_tax($forDisplay = true) {
146	global $wpsc_cart;
147	if($forDisplay){
148	if(wpsc_tax_isincluded() == false){
149	- return ~~$wpsc_cart->process_as_currency~~($wpsc_cart->calculate_total_tax());
150	}else{
151	- return '('~~.$wpsc_cart->process_as_currency~~($wpsc_cart->calculate_total_tax()).')';
152	}
153
154	}else{
	@@ -212,7 +212,7 @@ function wpsc_cart_has_shipping() {
212	*/
213	function wpsc_cart_shipping() {
214	global $wpsc_cart;
215	- return ~~$wpsc_cart->process_as_currency~~($wpsc_cart->calculate_total_shipping());
216	}
217
218
	@@ -294,7 +294,7 @@ function wpsc_cart_item_quantity_single_prod($id) {
294	function wpsc_cart_item_price($forDisplay = true) {
295	global $wpsc_cart;
296	if($forDisplay){
297	- return ~~$wpsc_cart->process_as_currency~~($wpsc_cart->cart_item->total_price);
298	}else{
299	return $wpsc_cart->cart_item->total_price;
300	}
	@@ -307,7 +307,7 @@ function wpsc_cart_item_price($forDisplay = true) {
307	function wpsc_cart_single_item_price($forDisplay = true) {
308	global $wpsc_cart;
309	if($forDisplay){
310	- return ~~$wpsc_cart->process_as_currency~~(($wpsc_cart->cart_item->total_price) / ($wpsc_cart->cart_item->quantity));
311	}else{
312	return ($wpsc_cart->cart_item->total_price / $wpsc_cart->cart_item->quantity);
313	}
	@@ -320,7 +320,7 @@ function wpsc_cart_single_item_price($forDisplay = true) {
320	function wpsc_cart_item_shipping($forDisplay = true) {
321	global $wpsc_cart;
322	if($forDisplay){
323	- return ~~$wpsc_cart->process_as_currency~~($wpsc_cart->cart_item->shipping);
324	}else{
325	return $wpsc_cart->cart_item->shipping;
326	}
	@@ -461,7 +461,7 @@ function wpsc_shipping_quote_value($numeric = false) {
461	if($numeric == true) {
462	return $wpsc_cart->shipping_quote['value'];
463	} else {
464	- return ~~$wpsc_cart->process_as_currency~~($wpsc_cart->shipping_quote['value']);
465	}
466	}
467
	@@ -482,6 +482,7 @@ function wpsc_shipping_quote_selected_state() {
482	global $wpsc_cart;
483
484	if(($wpsc_cart->selected_shipping_method == $wpsc_cart->shipping_method) && ($wpsc_cart->selected_shipping_option == $wpsc_cart->shipping_quote['name']) ) {

485	return "checked='checked'";
486	} else {
487	return "";
	@@ -540,6 +541,10 @@ function wpsc_update_shipping_multiple_methods(){
540	}
541	}
542




543	/**
544	* The WPSC Cart class
545	*/
	@@ -551,6 +556,7 @@ class wpsc_cart {
551
552	var $selected_shipping_method = null;
553	var $selected_shipping_option = null;

554
555	var $coupon;
556	var $tax_percentage;
	@@ -829,7 +835,7 @@ class wpsc_cart {
829
830	if(($parameters['quantity'] > 0) && ($this->check_remaining_quantity($product_id, $parameters['variation_values'], $parameters['quantity']) == true)) {
831	$new_cart_item = new wpsc_cart_item($product_id,$parameters, $this);
832	-
833	$add_item = true;
834	$edit_item = false;
835	if((count($this->cart_items) > 0) && ($new_cart_item->is_donation != 1)) {
	@@ -858,6 +864,7 @@ class wpsc_cart {
858	if($add_item === true) {
859	$this->cart_items[] = $new_cart_item;
860	}

861	}
862
863	// if some action was performed, return true, otherwise, return false;
	@@ -940,23 +947,25 @@ class wpsc_cart {
940	* @param array variations on the product
941	* @return boolean true on sucess, false on failure
942	*/
943	- function get_remaining_quantity($product_id, $variations = array(), $quantity = 1) {
944	- global $wpdb;
945	- $stock = get_post_meta($product_id, '_wpsc_stock', true);
946	- $stock = apply_filters('wpsc_product_stock', $stock, $product_id);
947	- // check to see if the product uses stock
948	- if(is_numeric($stock)){
949	- $priceandstock_id = 0;
950	- if($stock > 0) {
951	- $claimed_stock = $wpdb->get_var("SELECT SUM(`stock_claimed`) FROM `".WPSC_TABLE_CLAIMED_STOCK."` WHERE `product_id` IN('$product_id') AND `variation_stock_id` IN('$priceandstock_id')");
952	- $output = $stock - $claimed_stock;
953	- } else {
954	- $output = 0;
955	- }
956
957	- }
958	- ~~return~~ $~~output~~;
959	- }













960
961
962	/**
	@@ -997,8 +1006,8 @@ class wpsc_cart {
997	$this->cart_item = null;
998	$this->cart_item_count = 0;
999	$this->current_cart_item = -1;
1000	- ~~unset(~~$this->coupons_amount);
1001	- ~~unset(~~$this->coupons_name);
1002	$this->clear_cache();
1003	$this->cleanup();
1004	}
	@@ -1213,7 +1222,7 @@ class wpsc_cart {
1213	function calculate_base_shipping() {
1214	global $wpdb, $wpsc_shipping_modules;
1215	if($this->uses_shipping()) {
1216	- if ( empty( $this->shipping_quotes ) && is_callable( array( $wpsc_shipping_modules[$this->selected_shipping_method], "getQuote" ) ) ) {
1217	$this->shipping_quotes = $wpsc_shipping_modules[$this->selected_shipping_method]->getQuote();
1218	}
1219	if($this->selected_shipping_option == null){
	@@ -1279,44 +1288,8 @@ class wpsc_cart {
1279	* @return string a price with a currency sign
1280	*/
1281	function process_as_currency($price) {
1282	- ~~global~~ ~~$wpdb~~, ~~$wpsc_currency_data~~;
1283	- ~~$currency_type~~ ~~= get_option~~(~~'currency_type'~~);
1284	- if(count($wpsc_currency_data) < 3) {
1285	- $wpsc_currency_data = $wpdb->get_row("SELECT `symbol`,`symbol_html`,`code` FROM `".WPSC_TABLE_CURRENCY_LIST."` WHERE `id`='".$currency_type."' LIMIT 1",ARRAY_A) ;
1286	- }
1287	- $price = round($price + pow(10, -2-1), 2);
1288	- $price = number_format($price, 2, '.', ',');
1289	-
1290	- if($wpsc_currency_data['symbol'] != '') {
1291	- if(isset($nohtml) && $nohtml == true) {
1292	- $currency_sign = $wpsc_currency_data['symbol'];
1293	- } else {
1294	- $currency_sign = $wpsc_currency_data['symbol_html'];
1295	- }
1296	- } else {
1297	- $currency_sign = $wpsc_currency_data['code'];
1298	- }
1299	-
1300	- $currency_sign_location = get_option('currency_sign_location');
1301	- switch($currency_sign_location) {
1302	- case 1:
1303	- $output = $price.$currency_sign;
1304	- break;
1305	-
1306	- case 2:
1307	- $output = $price.' '.$currency_sign;
1308	- break;
1309	-
1310	- case 3:
1311	- $output = $currency_sign.$price;
1312	- break;
1313	-
1314	- case 4:
1315	- $output = $currency_sign.' '.$price;
1316	- break;
1317	- }
1318	-
1319	- return $output;
1320	}
1321
1322	/**
	@@ -1720,7 +1693,7 @@ class wpsc_cart_item {
1720	$this->is_downloadable = false;
1721	}
1722
1723	- if (isset($this->cart->selected_shipping_method) && is_callable( array( $wpsc_shipping_modules[$this->cart->selected_shipping_method], "get_item_shipping" ) ) )
1724	$this->shipping = $wpsc_shipping_modules[$this->cart->selected_shipping_method]->get_item_shipping($this);
1725
1726	// update the claimed stock here
	@@ -1739,17 +1712,18 @@ class wpsc_cart_item {
1739	*/
1740
1741	function calculate_shipping($method = null) {
1742	- global $wpdb, $wpsc_cart, $wpsc_shipping_modules;
1743	- ~~if(~~$~~method~~ ~~===~~ ~~null) {~~
1744	- $method = ~~$this->cart->selected_shipping_method;~~
1745	- }
1746	- ~~if(method_exists( $wpsc_shipping_modules[$method], "get_item_shipping" )) {~~

1747	$shipping = $wpsc_shipping_modules[$method]->get_item_shipping($this);
1748	- }
1749	- if($method == $this->cart->selected_shipping_method) {
1750	$this->shipping = $shipping;
1751	- }
1752	- return $shipping;
1753	}
1754
1755	/**
	@@ -1849,9 +1823,8 @@ class wpsc_cart_item {
1849	function save_to_db($purchase_log_id) {
1850	global $wpdb, $wpsc_shipping_modules;
1851
1852	- ~~if(~~$method ~~===~~ ~~null) {~~
1853	- $~~method~~ = ~~$this->cart->selected_shipping_method~~;
1854	- }
1855	if(method_exists( $wpsc_shipping_modules[$method], "get_item_shipping" )) {
1856	$shipping = $wpsc_shipping_modules[$this->cart->selected_shipping_method]->get_item_shipping($this);
1857	}


46	function wpsc_coupon_amount($forDisplay=true) {
47	global $wpsc_cart;
48	if($forDisplay == true) {
49	+ $output = wpsc_currency_display($wpsc_cart->coupons_amount);
50	} else {
51	$output = $wpsc_cart->coupons_amount;
52	}

71	$total = 0;
72	}
73	if($forDisplay){
74	+ return wpsc_currency_display($total);
75	}else{
76	return $total;
77	}

103	}
104
105	if ( get_option( 'add_plustax' ) == 1 ) {
106	+ return wpsc_currency_display( $wpsc_cart->calculate_subtotal() );
107	} else {
108	+ return wpsc_currency_display( $total );
109	}
110
111	}

146	global $wpsc_cart;
147	if($forDisplay){
148	if(wpsc_tax_isincluded() == false){
149	+ return wpsc_currency_display($wpsc_cart->calculate_total_tax());
150	}else{
151	+ return '(' . wpsc_currency_display($wpsc_cart->calculate_total_tax()) . ')';
152	}
153
154	}else{

212	*/
213	function wpsc_cart_shipping() {
214	global $wpsc_cart;
215	+ return wpsc_currency_display($wpsc_cart->calculate_total_shipping());
216	}
217
218

294	function wpsc_cart_item_price($forDisplay = true) {
295	global $wpsc_cart;
296	if($forDisplay){
297	+ return wpsc_currency_display($wpsc_cart->cart_item->total_price);
298	}else{
299	return $wpsc_cart->cart_item->total_price;
300	}

307	function wpsc_cart_single_item_price($forDisplay = true) {
308	global $wpsc_cart;
309	if($forDisplay){
310	+ return wpsc_currency_display(($wpsc_cart->cart_item->total_price) / ($wpsc_cart->cart_item->quantity));
311	}else{
312	return ($wpsc_cart->cart_item->total_price / $wpsc_cart->cart_item->quantity);
313	}

320	function wpsc_cart_item_shipping($forDisplay = true) {
321	global $wpsc_cart;
322	if($forDisplay){
323	+ return wpsc_currency_display($wpsc_cart->cart_item->shipping);
324	}else{
325	return $wpsc_cart->cart_item->shipping;
326	}

461	if($numeric == true) {
462	return $wpsc_cart->shipping_quote['value'];
463	} else {
464	+ return wpsc_currency_display($wpsc_cart->shipping_quote['value']);
465	}
466	}
467

482	global $wpsc_cart;
483
484	if(($wpsc_cart->selected_shipping_method == $wpsc_cart->shipping_method) && ($wpsc_cart->selected_shipping_option == $wpsc_cart->shipping_quote['name']) ) {
485	+ $wpsc_cart->selected_shipping_amount = $wpsc_cart->base_shipping;
486	return "checked='checked'";
487	} else {
488	return "";

541	}
542	}
543
544	+ function wpsc_get_remaining_quantity($product_id, $variations = array(), $quantity = 1) {
545	+ return wpsc_cart::get_remaining_quantity($product_id, $variations, $quantity);
546	+ }
547	+
548	/**
549	* The WPSC Cart class
550	*/

556
557	var $selected_shipping_method = null;
558	var $selected_shipping_option = null;
559	+ var $selected_shipping_amount = null;
560
561	var $coupon;
562	var $tax_percentage;

835
836	if(($parameters['quantity'] > 0) && ($this->check_remaining_quantity($product_id, $parameters['variation_values'], $parameters['quantity']) == true)) {
837	$new_cart_item = new wpsc_cart_item($product_id,$parameters, $this);
838	+ do_action('wpsc_set_cart_item' , $product_id , $parameters , $this);
839	$add_item = true;
840	$edit_item = false;
841	if((count($this->cart_items) > 0) && ($new_cart_item->is_donation != 1)) {

864	if($add_item === true) {
865	$this->cart_items[] = $new_cart_item;
866	}
867	+
868	}
869
870	// if some action was performed, return true, otherwise, return false;

947	* @param array variations on the product
948	* @return boolean true on sucess, false on failure
949	*/
950	+ function get_remaining_quantity($product_id, $variations = array(), $quantity = 1) {
951	+ global $wpdb;











952
953	+ $stock = get_post_meta($product_id, '_wpsc_stock', true);
954	+ $stock = apply_filters('wpsc_product_stock', $stock, $product_id);
955	+ $output = 0;
956	+
957	+ // check to see if the product uses stock
958	+ if (is_numeric( $stock ) ) {
959	+ $priceandstock_id = 0;
960	+
961	+ if ( $stock > 0 ) {
962	+ $claimed_stock = $wpdb->get_var( "SELECT SUM(`stock_claimed`) FROM `" . WPSC_TABLE_CLAIMED_STOCK . "` WHERE `product_id` IN('$product_id') AND `variation_stock_id` IN('$priceandstock_id')" );
963	+ $output = $stock - $claimed_stock;
964	+ }
965	+ }
966	+
967	+ return $output;
968	+ }
969
970
971	/**

1006	$this->cart_item = null;
1007	$this->cart_item_count = 0;
1008	$this->current_cart_item = -1;
1009	+ $this->coupons_amount = 0;
1010	+ $this->coupons_name = '';
1011	$this->clear_cache();
1012	$this->cleanup();
1013	}

1222	function calculate_base_shipping() {
1223	global $wpdb, $wpsc_shipping_modules;
1224	if($this->uses_shipping()) {
1225	+ if ( isset( $this->shipping_quotes ) && empty( $this->shipping_quotes ) && is_callable( array( $wpsc_shipping_modules[$this->selected_shipping_method], "getQuote" ) ) ) {
1226	$this->shipping_quotes = $wpsc_shipping_modules[$this->selected_shipping_method]->getQuote();
1227	}
1228	if($this->selected_shipping_option == null){

1288	* @return string a price with a currency sign
1289	*/
1290	function process_as_currency($price) {
1291	+ _deprecated_function( __FUNCTION__, '3.8', 'wpsc_currency_display');
1292	+ return wpsc_currency_display($price);




































1293	}
1294
1295	/**

1693	$this->is_downloadable = false;
1694	}
1695
1696	+ if (isset($this->cart->selected_shipping_method) && isset( $wpsc_shipping_modules[$this->cart->selected_shipping_method] ) && is_callable( array( $wpsc_shipping_modules[$this->cart->selected_shipping_method], "get_item_shipping" ) ) )
1697	$this->shipping = $wpsc_shipping_modules[$this->cart->selected_shipping_method]->get_item_shipping($this);
1698
1699	// update the claimed stock here

1712	*/
1713
1714	function calculate_shipping($method = null) {
1715	+ global $wpdb, $wpsc_cart, $wpsc_shipping_modules;
1716	+ $shipping = '';
1717	+ if($method === null)
1718	+ $method = $this->cart->selected_shipping_method;
1719	+
1720	+ if(method_exists( $wpsc_shipping_modules[$method], "get_item_shipping" ))
1721	$shipping = $wpsc_shipping_modules[$method]->get_item_shipping($this);
1722	+
1723	+ if($method == $this->cart->selected_shipping_method && !empty( $shipping ) )
1724	$this->shipping = $shipping;
1725	+
1726	+ return $shipping;
1727	}
1728
1729	/**

1823	function save_to_db($purchase_log_id) {
1824	global $wpdb, $wpsc_shipping_modules;
1825
1826	+ $method = $this->cart->selected_shipping_method;
1827	+ $shipping = 0;

1828	if(method_exists( $wpsc_shipping_modules[$method], "get_item_shipping" )) {
1829	$shipping = $wpsc_shipping_modules[$this->cart->selected_shipping_method]->get_item_shipping($this);
1830	}

wpsc-includes/category.functions.php CHANGED Viewed

@@ -137,16 +137,17 @@ function wpsc_print_category_classes($category_to_print = false, $echo = true) {
             		$curr_cat_parents = wpsc_get_term_parents($curr_cat->term_id, 'wpsc_product_category');
             		//if current category is the same as the one we are printing - then add wpsc-current-cat class
-            -
            		if( $category_to_print[term_id] == $curr_cat->term_id )
             			$result = ' wpsc-current-cat ';
             		//else check if the category that we are printing is parent of current category
             		elseif ( in_array($category_to_print[term_id], $curr_cat_parents) )
             			$result = ' wpsc-cat-ancestor ';
+            	}
-            -
            	if($echo)
-            -
            		echo $result;
-            -
            	else
-            -
            		return $result;
+            }
@@ -382,7 +383,6 @@ function wpsc_place_category_image($category_id, $query) {
             * @param boolean permalink compatibility, adds a prefix to prevent permalink namespace conflicts
             */
             function wpsc_category_url($category_id, $permalink_compatibility = false) {
-            -
              global $wpdb, $wp_rewrite;
               return get_term_link( $category_id, 'wpsc_product_category');
+            }
@@ -400,67 +400,74 @@ function wpsc_is_in_category() {
+            }
             /**
             * wpsc_category_image function, Gets the category image or returns false
             * @param integer category ID, can be 0
-            -
            * @param string url to the category image
             */
             function wpsc_category_image($category_id = null) {
-            -
              global $wpdb, $wp_query;
-            -
              if($category_id < 1) {
-            -
            		if($wp_query->query_vars['category_id'] > 0) {
-            -
            			$category_id = $wp_query->query_vars['category_id'];
-            -
            		} else if(isset($_GET['category']) && ($_GET['category'] > 0)) {
-            -
            			$category_id = $_GET['category'];
-            -
            		}
-            -
              }
-            -
              $category_id = absint($category_id);
-            -
              $category_image = wpsc_get_categorymeta($category_id, 'image');
-            -
-            -
              $category_path = WPSC_CATEGORY_DIR.basename($category_image);
-            -
              $category_url = WPSC_CATEGORY_URL.basename($category_image);
-            -
              if(file_exists($category_path) && is_file($category_path)) {
-            -
                return $category_url;
-            -
              } else {
-            -
                return false;
-            -
              }
+            }
             /**
             * wpsc_category_description function, Gets the category description
             * @param integer category ID, can be 0
-            -
            * @param string category description
             */
             function wpsc_category_description($category_id = null) {
-            -
              global $wpdb, $wp_query;
-            -
              if($category_id < 1) {
-            -
            		if($wp_query->query_vars['category_id'] > 0) {
-            -
            			$category_id = $wp_query->query_vars['category_id'];
-            -
            		} else if(isset($_GET['category']) && ($_GET['category'] > 0)) {
-            -
            			$category_id = $_GET['category'];
-            -
            		}
-            -
              }
-            -
              $category_id = absint($category_id);
-            -
              $category_description = wpsc_get_categorymeta($category_id, 'description');
-            -
              return $category_description;
+            }
             function wpsc_category_name($category_id = null) {
-            -
              global $wpdb, $wp_query;
-            -
              if($category_id < 1) {
-            -
            		if($wp_query->query_vars['category_id'] > 0) {
-            -
            			$category_id = $wp_query->query_vars['category_id'];
-            -
            		} else if(isset($_GET['category']) && ($_GET['category'] > 0)) {
-            -
            			$category_id = $_GET['category'];
-            -
            		}
-            -
              }
-            -
              $category_id = absint($category_id);
-            -
-            -
              $category_data = get_term_by('id', $category_id, 'wpsc_product_category', ARRAY_A);
-            -
-            -
              $category_name = $category_data['name'];
-            -
              return $category_name;
+            }
             function nzshpcrt_display_categories_groups() {


137	$curr_cat_parents = wpsc_get_term_parents($curr_cat->term_id, 'wpsc_product_category');
138
139	//if current category is the same as the one we are printing - then add wpsc-current-cat class
140	+ if( $category_to_print['term_id'] == $curr_cat->term_id )
141	$result = ' wpsc-current-cat ';
142	//else check if the category that we are printing is parent of current category
143	elseif ( in_array($category_to_print[term_id], $curr_cat_parents) )
144	$result = ' wpsc-cat-ancestor ';
145	}
146	+ if( isset($result) )
147	+ if($echo)
148	+ echo $result;
149	+ else
150	+ return $result;
151	}
152
153

383	* @param boolean permalink compatibility, adds a prefix to prevent permalink namespace conflicts
384	*/
385	function wpsc_category_url($category_id, $permalink_compatibility = false) {

386	return get_term_link( $category_id, 'wpsc_product_category');
387	}
388

400	}
401
402
403	+ /**
404	+ * Uses a category's, (in the wpsc_product_category taxonomy), slug to find its
405	+ * ID, then returns it.
406	+ *
407	+ * @param string $category_slug The slug of the category who's ID we want.
408	+ * @return (int \| bool) Returns the integer ID of the category if found, or a
409	+ * boolean false if the category is not found.
410	+ *
411	+ * @todo Cache the results of this somewhere. It could save quite a few trips
412	+ * to the MySQL server.
413	+ *
414	+ * @author John Beales ( johnbeales.com )
415	+ */
416	+ function wpsc_category_id($category_slug = '') {
417	+ if(empty($category_slug)) {
418	+ $query_vars = get_query_var('query_vars');
419	+ $category_slug = $query_vars['wpsc_product_category'];
420	+ } elseif(array_key_exists('wpsc_product_category', $_GET)) {
421	+ $category_slug = $_GET['wpsc_product_category'];
422	+ }
423	+
424	+ if(!empty($category_slug)) {
425	+ $category = get_term_by('slug', $category_slug, 'wpsc_product_category');
426	+ if(!empty($category->term_id)){
427	+ return $category->term_id;
428	+ } else {
429	+ return false;
430	+ }
431	+ } else {
432	+ return false;
433	+ }
434	+ }
435	+
436	+
437	/**
438	* wpsc_category_image function, Gets the category image or returns false
439	* @param integer category ID, can be 0
440	+ * @return string url to the category image
441	*/
442	function wpsc_category_image($category_id = null) {
443	+ if($category_id < 1)
444	+ $category_id = wpsc_category_id();
445	+ $category_image = wpsc_get_categorymeta($category_id, 'image');
446	+ $category_path = WPSC_CATEGORY_DIR.basename($category_image);
447	+ $category_url = WPSC_CATEGORY_URL.basename($category_image);
448	+ if(file_exists($category_path) && is_file($category_path))
449	+ return $category_url;
450	+ return false;










451	}
452
453
454	/**
455	* wpsc_category_description function, Gets the category description
456	* @param integer category ID, can be 0
457	+ * @return string category description
458	*/
459	function wpsc_category_description($category_id = null) {
460	+ if($category_id < 1)
461	+ $category_id = wpsc_category_id();
462	+ $category = get_term_by('id', $category_id, 'wpsc_product_category');
463	+ return $category->description;







464	}
465
466	function wpsc_category_name($category_id = null) {
467	+ if($category_id < 1)
468	+ $category_id = wpsc_category_id();
469	+ $category = get_term_by('id', $category_id, 'wpsc_product_category');
470	+ return $category->name;










471	}
472
473	function nzshpcrt_display_categories_groups() {

wpsc-includes/checkout.class.php CHANGED Viewed

	@@ -442,7 +442,7 @@ function wpsc_shipping_region_list( $selected_country, $selected_region, $shippi
442	if ( $selected_region == $region['id'] ) {
443	$selected = "selected='selected'";
444	}
445	- $output .= "<option $selected value='{$region['id']}'>" . htmlspecialchars( $region['name'] ) . "</option>";
446	}
447	$output .= "";
448
	@@ -465,10 +465,10 @@ function wpsc_shipping_country_list( $shippingdetails = false ) {
465	$selected_region = $_SESSION['wpsc_delivery_region'];
466
467	if ( empty( $selected_country ) )
468	- $selected_country = get_option( 'base_country' );
469
470	if ( empty( $selected_region ) )
471	- $selected_region = get_option( 'base_region' );
472
473	$country_data = $wpdb->get_results( "SELECT * FROM `" . WPSC_TABLE_CURRENCY_LIST . "` WHERE `visible`= '1' ORDER BY `country` ASC", ARRAY_A );
474
	@@ -478,7 +478,7 @@ function wpsc_shipping_country_list( $shippingdetails = false ) {
478	if ( $selected_country == $country['isocode'] ) {
479	$selected = "selected='selected'";
480	}
481	- $output .= "<option value='" . $country['isocode'] . "' $selected>" . htmlspecialchars( $country['country'] ) . "</option>";
482
483	}
484
	@@ -585,9 +585,9 @@ class wpsc_checkout {
585
586	function form_name() {
587	if ( $this->form_name_is_required() && ($this->checkout_item->type != 'heading') )
588	- return stripslashes( $this->checkout_item->name ) . ' <span class="asterix">*</span> ';
589	else
590	- return stripslashes( $this->checkout_item->name );
591	}
592
593	function form_name_is_required() {
	@@ -630,19 +630,7 @@ class wpsc_checkout {
630
631	$delivery_country_id = wpsc_get_country_form_id_by_type('delivery_country');
632	$billing_country_id = wpsc_get_country_form_id_by_type('country');
633	- ~~if(is_array($_SESSION['wpsc_checkout_saved_values']) && ($this->checkout_item->id == $delivery_country_id) \|\| ($this->checkout_item->id == $billing_country_id)){~~
634	- if( isset($_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id]) && is_array($_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id])
635	- && count($_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id]) > 1 ){
636	- /*
637	- $_SESSION['wpsc_delivery_country'] = $_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id][0];
638	- $_SESSION['wpsc_delivery_region'] = $_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id][1];
639	- */
640	- } elseif(isset($_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id]) && is_array($_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id])) {
641	- /* $_SESSION['wpsc_delivery_country'] = $_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id][0]; */
642	- }elseif(isset($_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id])){
643	- /* $_SESSION['wpsc_delivery_country'] = $_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id]; */
644	- }
645	- }
646	}
647	$saved_form_data = @htmlentities( stripslashes( (string)$_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id] ), ENT_QUOTES, 'UTF-8' );
648	$an_array = '';
	@@ -663,7 +651,7 @@ class wpsc_checkout {
663	if ( $options != '' ) {
664	$i = mt_rand();
665	foreach ( $options as $label => $value ) {
666	- $output .= "<input type='hidden' title='" . $this->checkout_item->unique_name . "' id='" . $this->form_element_id() . "' value='-1' name='collected_data[{$this->checkout_item->id}][" . $i . "]'/><input type='checkbox' title='" . $this->checkout_item->unique_name . "' id='" . $this->form_element_id() . "' value='" . $value . "' name='collected_data[{$this->checkout_item->id}][" . $i . "]'/> ";
667	$output .= "<label for='" . $this->form_element_id() . "'>" . $label . "</label>";
668	}
669	}
	@@ -676,7 +664,7 @@ class wpsc_checkout {
676	case "delivery_country":
677	if ( wpsc_uses_shipping ( ) ) {
678	$country_name = $wpdb->get_var( "SELECT `country` FROM `" . WPSC_TABLE_CURRENCY_LIST . "` WHERE `isocode`='" . $_SESSION['wpsc_delivery_country'] . "' LIMIT 1" );
679	- $output = "<input title='" . $this->checkout_item->unique_name . "' type='hidden' id='" . $this->form_element_id() . "' class='shipping_country' name='collected_data[{$this->checkout_item->id}]' value='" . $_SESSION['wpsc_delivery_country'] . "' size='4' /><span class='shipping_country_name'>" . $country_name . "</span> ";
680	} else {
681	$checkoutfields = true;
682	$output = wpsc_country_region_list( $this->checkout_item->id, false, $_SESSION['wpsc_delivery_country'], $_SESSION['wpsc_delivery_region'], $this->form_element_id(), $checkoutfields );
	@@ -688,8 +676,8 @@ class wpsc_checkout {
688	$output = "<select name='collected_data[{$this->checkout_item->id}]" . $an_array . "'>";
689	$output .= "<option value='-1'>Select an Option</option>";
690	foreach ( (array)$options as $label => $value ) {
691	- $value = str_replace( ' ', '', $value );
692	- $output .="<option value='" . $value . "'>" . $label . "</option>\n\r";
693	}
694	$output .="</select>";
695	}
	@@ -699,7 +687,7 @@ class wpsc_checkout {
699	if ( $options != '' ) {
700	$i = mt_rand();
701	foreach ( (array)$options as $label => $value ) {
702	- $output .= "<input type='radio' title='" . $this->checkout_item->unique_name . "' id='" . $this->form_element_id() . "'value='" . $value . "' name='collected_data[{$this->checkout_item->id}][" . $i . "]'/> ";
703	$output .= "<label for='" . $this->form_element_id() . "'>" . $label . "</label>";
704	}
705	}
	@@ -812,16 +800,18 @@ class wpsc_checkout {
812	$our_user_id = '';
813	}
814	}
815	- if ( $our_user_id < 1 ) {
816	$our_user_id = $user_ID;
817	}
818	// check we have a user id
819	- if ( $our_user_id > 0 ) {
820	$user_ID = $our_user_id;
821	}
822	//Basic Form field validation for billing and shipping details
823	foreach ( $this->checkout_items as $form_data ) {
824	- $value = ~~$_POST[~~'~~collected_data~~'~~][$form_data->id]~~;


825	$_SESSION['wpsc_checkout_saved_values'][$form_data->id] = $value;
826	$bad_input = false;
827	if ( ($form_data->mandatory == 1) \|\| ($form_data->type == "coupon") ) {
	@@ -851,7 +841,7 @@ class wpsc_checkout {
851	break;
852	}
853	if ( $bad_input === true ) {
854	- $_SESSION['wpsc_checkout_error_messages'][$form_data->id] = sprintf(__( 'Please enter a valid %s.', 'wpsc' ), ~~strtolower~~( $form_data->name ));
855	$_SESSION['wpsc_checkout_saved_values'][$form_data->id] = '';
856	}
857	}
	@@ -875,10 +865,12 @@ class wpsc_checkout {
875	$count = $this->get_count_checkout_fields() + 1;
876	$i = 0;
877	foreach ( $this->checkout_items as $form_data ) {
878	- $value = ~~$_POST[~~'~~collected_data~~'~~][$form_data->id]~~;
879	- if ( $~~value ==~~ '' ) {


880	$value = $form_data->value;
881	- }
882
883	if ( $form_data->type != 'heading' ) {
884	if ( is_array( $value ) && ($form_data->unique_name == 'billingcountry' \|\| $form_data->unique_name == 'shippingcountry') ) {


442	if ( $selected_region == $region['id'] ) {
443	$selected = "selected='selected'";
444	}
445	+ $output .= "<option $selected value='{$region['id']}'>" . esc_attr( htmlspecialchars( $region['name'] ) ). "</option>";
446	}
447	$output .= "";
448

465	$selected_region = $_SESSION['wpsc_delivery_region'];
466
467	if ( empty( $selected_country ) )
468	+ $selected_country = esc_attr( get_option( 'base_country' ) );
469
470	if ( empty( $selected_region ) )
471	+ $selected_region = esc_attr( get_option( 'base_region' ) );
472
473	$country_data = $wpdb->get_results( "SELECT * FROM `" . WPSC_TABLE_CURRENCY_LIST . "` WHERE `visible`= '1' ORDER BY `country` ASC", ARRAY_A );
474

478	if ( $selected_country == $country['isocode'] ) {
479	$selected = "selected='selected'";
480	}
481	+ $output .= "<option value='" . $country['isocode'] . "' $selected>" . esc_attr(htmlspecialchars( $country['country'] ) ) . "</option>";
482
483	}
484

585
586	function form_name() {
587	if ( $this->form_name_is_required() && ($this->checkout_item->type != 'heading') )
588	+ return esc_html( stripslashes( $this->checkout_item->name ) ) . ' <span class="asterix">*</span> ';
589	else
590	+ return esc_html( stripslashes( $this->checkout_item->name ) );
591	}
592
593	function form_name_is_required() {

630
631	$delivery_country_id = wpsc_get_country_form_id_by_type('delivery_country');
632	$billing_country_id = wpsc_get_country_form_id_by_type('country');
633	+












634	}
635	$saved_form_data = @htmlentities( stripslashes( (string)$_SESSION['wpsc_checkout_saved_values'][$this->checkout_item->id] ), ENT_QUOTES, 'UTF-8' );
636	$an_array = '';

651	if ( $options != '' ) {
652	$i = mt_rand();
653	foreach ( $options as $label => $value ) {
654	+ $output .= "<input type='hidden' title='" . $this->checkout_item->unique_name . "' id='" . $this->form_element_id() . "' value='-1' name='collected_data[{$this->checkout_item->id}][" . $i . "]'/><input type='checkbox' title='" . $this->checkout_item->unique_name . "' id='" . $this->form_element_id() . "' value='" . esc_attr( $value ) . "' name='collected_data[{$this->checkout_item->id}][" . $i . "]'/> ";
655	$output .= "<label for='" . $this->form_element_id() . "'>" . $label . "</label>";
656	}
657	}

664	case "delivery_country":
665	if ( wpsc_uses_shipping ( ) ) {
666	$country_name = $wpdb->get_var( "SELECT `country` FROM `" . WPSC_TABLE_CURRENCY_LIST . "` WHERE `isocode`='" . $_SESSION['wpsc_delivery_country'] . "' LIMIT 1" );
667	+ $output = "<input title='" . $this->checkout_item->unique_name . "' type='hidden' id='" . $this->form_element_id() . "' class='shipping_country' name='collected_data[{$this->checkout_item->id}]' value='" . esc_attr( $_SESSION['wpsc_delivery_country'] ) . "' size='4' /><span class='shipping_country_name'>" . $country_name . "</span> ";
668	} else {
669	$checkoutfields = true;
670	$output = wpsc_country_region_list( $this->checkout_item->id, false, $_SESSION['wpsc_delivery_country'], $_SESSION['wpsc_delivery_region'], $this->form_element_id(), $checkoutfields );

676	$output = "<select name='collected_data[{$this->checkout_item->id}]" . $an_array . "'>";
677	$output .= "<option value='-1'>Select an Option</option>";
678	foreach ( (array)$options as $label => $value ) {
679	+ $value = esc_attr(str_replace( ' ', '', $value ) );
680	+ $output .="<option value='" . esc_attr( $value ) . "'>" . esc_html( $label ) . "</option>\n\r";
681	}
682	$output .="</select>";
683	}

687	if ( $options != '' ) {
688	$i = mt_rand();
689	foreach ( (array)$options as $label => $value ) {
690	+ $output .= "<input type='radio' title='" . $this->checkout_item->unique_name . "' id='" . $this->form_element_id() . "'value='" . esc_attr( $value ) . "' name='collected_data[{$this->checkout_item->id}][" . $i . "]'/> ";
691	$output .= "<label for='" . $this->form_element_id() . "'>" . $label . "</label>";
692	}
693	}

800	$our_user_id = '';
801	}
802	}
803	+ if ( isset( $our_user_id ) && $our_user_id < 1 ) {
804	$our_user_id = $user_ID;
805	}
806	// check we have a user id
807	+ if ( isset( $our_user_id ) && $our_user_id > 0 ) {
808	$user_ID = $our_user_id;
809	}
810	//Basic Form field validation for billing and shipping details
811	foreach ( $this->checkout_items as $form_data ) {
812	+ $value = '';
813	+ if( isset( $_POST['collected_data'][$form_data->id] ) )
814	+ $value = $_POST['collected_data'][$form_data->id];
815	$_SESSION['wpsc_checkout_saved_values'][$form_data->id] = $value;
816	$bad_input = false;
817	if ( ($form_data->mandatory == 1) \|\| ($form_data->type == "coupon") ) {

841	break;
842	}
843	if ( $bad_input === true ) {
844	+ $_SESSION['wpsc_checkout_error_messages'][$form_data->id] = sprintf(__( 'Please enter a valid <span class="wpsc_error_msg_field_name">%s</span>.', 'wpsc' ), esc_attr($form_data->name) );
845	$_SESSION['wpsc_checkout_saved_values'][$form_data->id] = '';
846	}
847	}

865	$count = $this->get_count_checkout_fields() + 1;
866	$i = 0;
867	foreach ( $this->checkout_items as $form_data ) {
868	+ $value = '';
869	+ if( isset( $_POST['collected_data'][$form_data->id] ) )
870	+ $value = $_POST['collected_data'][$form_data->id];
871	+ if ( empty( $value ) && isset( $form_data->value ) )
872	$value = $form_data->value;
873	+
874
875	if ( $form_data->type != 'heading' ) {
876	if ( is_array( $value ) && ($form_data->unique_name == 'billingcountry' \|\| $form_data->unique_name == 'shippingcountry') ) {

wpsc-includes/display.functions.php CHANGED Viewed

	@@ -126,7 +126,6 @@ function wpsc_loading_animation_url() {
126	}
127
128	function fancy_notifications() {
129	- global $wpdb;
130	$output = "";
131	if ( get_option( 'fancy_notifications' ) == 1 ) {
132	$output = "";
	@@ -147,7 +146,6 @@ function wpsc_fancy_notifications(){
147	add_action( 'wpsc_theme_footer', 'wpsc_fancy_notifications' );
148
149	function fancy_notification_content( $cart_messages ) {
150	- global $wpdb;
151	$siteurl = get_option( 'siteurl' );
152	foreach ( (array)$cart_messages as $cart_message ) {
153	$output .= "<span>" . $cart_message . "</span><br />";
	@@ -163,7 +161,6 @@ function fancy_notification_content( $cart_messages ) {
163	*/
164
165	function wpsc_product_url( $product_id, $category_id = null, $escape = true ) {
166	- global $wpdb, $wp_rewrite, $wp_query;
167	$post = get_post($product_id);
168	if ( isset($post->post_parent) && $post->post_parent > 0) {
169	return get_permalink($post->post_parent);
	@@ -173,7 +170,6 @@ function wpsc_product_url( $product_id, $category_id = null, $escape = true ) {
173	}
174
175	function external_link( $product_id ) {
176	- global $wpdb;
177	$link = get_product_meta( $product_id, 'external_link', true );
178	if ( !stristr( $link, 'http://' ) ) {
179	$link = 'http://' . $link;
	@@ -183,56 +179,6 @@ function external_link( $product_id ) {
183	return $output;
184	}
185
186	- // displays error messages if the category setup is odd in some way
187	- // needs to be in a function because there are at least three places where this code must be used.
188	- function wpsc_odd_category_setup() {
189	- get_currentuserinfo();
190	- global $userdata;
191	- $output = '';
192	- if ( ($userdata->wp_capabilities['administrator'] == 1) \|\| ($userdata->user_level >= 9) ) {
193	- if ( get_option( 'wpsc_default_category' ) == 1 ) {
194	- $output = "<p>" . __( 'You are using the example product group as your default group and it has no products in it, you should set the default group to something else, you can do so from your Shop Settings page.', 'wpsc' ) . "</p>";
195	- } else {
196	- $output = "<p>" . __( 'This group is set as your default product group, you should either add some items to it or switch your default product group to one that does contain items.', 'wpsc' ) . "</p>";
197	- }
198	- }
199	- return $output;
200	- }
201	-
202	- function wpsc_product_image_html( $image_name, $product_id ) {
203	- global $wpdb, $wp_query;
204	- if ( is_numeric( $wp_query->query_vars['product_category'] ) ) {
205	- $category_id = (int)$wp_query->query_vars['product_category'];
206	- } else if ( is_numeric( $_GET['category'] ) ) {
207	- $category_id = (int)$_GET['category'];
208	- } else {
209	- $category_id = (int)get_option( 'wpsc_default_category' );
210	- }
211	-
212	- $product['height'] = get_product_meta( $id, 'thumbnail_height' );
213	- $product['width'] = get_product_meta( $id, 'thumbnail_width' );
214	-
215	-
216	- $use_thumbnail_image = 'false';
217	- if ( ($product['height'] > $category['height']) \|\| ($product['width'] > $category['width']) ) {
218	- $use_thumbnail_image = 'true';
219	- }
220	-
221	- if ( $category_id > 0 ) {
222	- $category = $wpdb->get_row( "SELECT `image_height` AS `height`, `image_width` AS `width` FROM `" . WPSC_TABLE_PRODUCT_CATEGORIES . "` WHERE `id` IN ('{$category_id}') LIMIT 1", ARRAY_A );
223	- }
224	- // if there is a height, width, and imagePNG function
225	- if ( ($category['height'] != null) && ($category['width'] != null) && (function_exists( 'ImagePNG' )) ) {
226	- $image_path = "index.php?productid=" . $product_id . "&thumbnail=" . $use_thumbnail_image . "&width=" . $category['width'] . "&height=" . $category['height'] . "";
227	- } else {
228	- $image_path = WPSC_THUMBNAIL_URL . $image_name;
229	- if ( is_ssl ( ) ) {
230	- $image_path = str_replace( "http://", "https://", $image_path );
231	- }
232	- }
233	- return $image_path;
234	- }
235	-
236	/* 19-02-09
237	* add cart button function used for php template tags and shortcodes
238	*/
	@@ -426,8 +372,7 @@ function wpsc_replace_bloginfo_title( $input, $show ) {
426	return $input;
427	}
428
429	- //if ( get_option( 'wpsc_replace_page_title' ) == 1 ) {
430	-
431	add_filter( 'wp_title', 'wpsc_replace_wp_title', 10, 2 );
432	- //}
433	?>


126	}
127
128	function fancy_notifications() {

129	$output = "";
130	if ( get_option( 'fancy_notifications' ) == 1 ) {
131	$output = "";

146	add_action( 'wpsc_theme_footer', 'wpsc_fancy_notifications' );
147
148	function fancy_notification_content( $cart_messages ) {

149	$siteurl = get_option( 'siteurl' );
150	foreach ( (array)$cart_messages as $cart_message ) {
151	$output .= "<span>" . $cart_message . "</span><br />";

161	*/
162
163	function wpsc_product_url( $product_id, $category_id = null, $escape = true ) {

164	$post = get_post($product_id);
165	if ( isset($post->post_parent) && $post->post_parent > 0) {
166	return get_permalink($post->post_parent);

170	}
171
172	function external_link( $product_id ) {

173	$link = get_product_meta( $product_id, 'external_link', true );
174	if ( !stristr( $link, 'http://' ) ) {
175	$link = 'http://' . $link;

179	return $output;
180	}
181


















































182	/* 19-02-09
183	* add cart button function used for php template tags and shortcodes
184	*/

372	return $input;
373	}
374
375	+ if ( get_option( 'wpsc_replace_page_title' ) == 1 ) {

376	add_filter( 'wp_title', 'wpsc_replace_wp_title', 10, 2 );
377	+ }
378	?>

wpsc-includes/meta.functions.php CHANGED Viewed

	@@ -21,7 +21,7 @@ function wpsc_get_meta( $object_id = 0, $meta_key, $type) {
21	$value = wp_cache_get( $cache_object_id, $object_type );
22	$meta_key = wpsc_sanitize_meta_key( $meta_key );
23	$meta_tuple = compact( 'object_type', 'object_id', 'meta_key', 'meta_value', 'type' );
24	- $meta_tuple = apply_filters( '~~wpsc_update_meta~~', $meta_tuple );
25	extract( $meta_tuple, EXTR_OVERWRITE );
26	$meta_value = $wpdb->get_var( $wpdb->prepare( "SELECT `meta_value` FROM `".WPSC_TABLE_META."` WHERE `object_type` = %s AND `object_id` = %d AND `meta_key` = %s", $object_type, $object_id, $meta_key ) );
27	$meta_value = maybe_unserialize( $meta_value );
	@@ -78,9 +78,9 @@ function wpsc_update_meta( $object_id = 0, $meta_key, $meta_value, $type, $globa
78	*/
79	function wpsc_delete_meta( $object_id = 0, $meta_key, $meta_value, $type, $global = false ) {
80	global $wpdb;
81	- if ( !is_numeric( $object_id ) \|\| empty( $object_id ) && !$global ) {
82	return false;
83	- }
84	$cache_object_id = $object_id = (int) $object_id;
85
86	$object_type = $type;
	@@ -93,15 +93,13 @@ function wpsc_delete_meta( $object_id = 0, $meta_key, $meta_value, $type, $globa
93
94	$meta_value = maybe_serialize( $meta_value );
95
96	- if ( empty( $meta_value ) ) {
97	$meta_sql = $wpdb->prepare( "SELECT `meta_id` FROM `".WPSC_TABLE_META."` WHERE `object_type` = %s AND `object_id` = %d AND `meta_key` = %s", $object_type, $object_id, $meta_key );
98	- } else {
99	$meta_sql = $wpdb->prepare( "SELECT `meta_id` FROM `".WPSC_TABLE_META."` WHERE `object_type` = %s AND `object_id` = %d AND `meta_key` = %s AND `meta_value` = %s", $object_type, $object_id, $meta_key, $meta_value );
100	- }
101
102	- if ( !$meta_id = $wpdb->get_var( $meta_sql ) ) {
103	return false;
104	- }
105
106	$wpdb->query( $wpdb->prepare( "DELETE FROM `".WPSC_TABLE_META."` WHERE `meta_id` = %d", $meta_id ) );
107	wp_cache_delete( $cache_object_id, $object_type );


21	$value = wp_cache_get( $cache_object_id, $object_type );
22	$meta_key = wpsc_sanitize_meta_key( $meta_key );
23	$meta_tuple = compact( 'object_type', 'object_id', 'meta_key', 'meta_value', 'type' );
24	+ $meta_tuple = apply_filters( 'wpsc_get_meta', $meta_tuple );
25	extract( $meta_tuple, EXTR_OVERWRITE );
26	$meta_value = $wpdb->get_var( $wpdb->prepare( "SELECT `meta_value` FROM `".WPSC_TABLE_META."` WHERE `object_type` = %s AND `object_id` = %d AND `meta_key` = %s", $object_type, $object_id, $meta_key ) );
27	$meta_value = maybe_unserialize( $meta_value );

78	*/
79	function wpsc_delete_meta( $object_id = 0, $meta_key, $meta_value, $type, $global = false ) {
80	global $wpdb;
81	+ if ( !is_numeric( $object_id ) \|\| empty( $object_id ) && !$global )
82	return false;
83	+
84	$cache_object_id = $object_id = (int) $object_id;
85
86	$object_type = $type;

93
94	$meta_value = maybe_serialize( $meta_value );
95
96	+ if ( empty( $meta_value ) )
97	$meta_sql = $wpdb->prepare( "SELECT `meta_id` FROM `".WPSC_TABLE_META."` WHERE `object_type` = %s AND `object_id` = %d AND `meta_key` = %s", $object_type, $object_id, $meta_key );
98	+ else
99	$meta_sql = $wpdb->prepare( "SELECT `meta_id` FROM `".WPSC_TABLE_META."` WHERE `object_type` = %s AND `object_id` = %d AND `meta_key` = %s AND `meta_value` = %s", $object_type, $object_id, $meta_key, $meta_value );

100
101	+ if ( !$meta_id = $wpdb->get_var( $meta_sql ) )
102	return false;

103
104	$wpdb->query( $wpdb->prepare( "DELETE FROM `".WPSC_TABLE_META."` WHERE `meta_id` = %d", $meta_id ) );
105	wp_cache_delete( $cache_object_id, $object_type );

wpsc-includes/misc.functions.php CHANGED Viewed

	@@ -64,22 +64,22 @@ function wpsc_add_new_user( $user_login, $user_pass, $user_email ) {
64
65	// Check the username
66	if ( $user_login == '' ) {
67	- $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );
68	} elseif ( !validate_username( $user_login ) ) {
69	- $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid. Please enter a valid username.' ) );
70	$user_login = '';
71	} elseif ( username_exists( $user_login ) ) {
72	- $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered, please choose another one.' ) );
73	}
74
75	// Check the e-mail address
76	if ( $user_email == '' ) {
77	- $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) );
78	} elseif ( !is_email( $user_email ) ) {
79	- $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn’t correct.' ) );
80	$user_email = '';
81	} elseif ( email_exists( $user_email ) ) {
82	- $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
83	}
84
85	if ( $errors->get_error_code() ) {
	@@ -87,7 +87,7 @@ function wpsc_add_new_user( $user_login, $user_pass, $user_email ) {
87	}
88	$user_id = wp_create_user( $user_login, $user_pass, $user_email );
89	if ( !$user_id ) {
90	- $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you... please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
91	return $errors;
92	}
93	$credentials = array( 'user_login' => $user_login, 'user_password' => $user_pass, 'remember' => true );
	@@ -761,7 +761,7 @@ function wpsc_check_memory_limit() {
761	foreach ( $sizes as $size ) {
762	// very, very rough estimation
763	if ( $freeMemory < round( $size['width'] * $size['height'] * 5.09 ) ) {
764	- $result = sprintf( __( 'Please refrain from uploading images larger than <strong>%d x %d</strong> pixels' ), $size['width'], $size['height'] );
765	return $result;
766	}
767	}


64
65	// Check the username
66	if ( $user_login == '' ) {
67	+ $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.', 'wpsc' ) );
68	} elseif ( !validate_username( $user_login ) ) {
69	+ $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid. Please enter a valid username.', 'wpsc' ) );
70	$user_login = '';
71	} elseif ( username_exists( $user_login ) ) {
72	+ $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered, please choose another one.', 'wpsc' ) );
73	}
74
75	// Check the e-mail address
76	if ( $user_email == '' ) {
77	+ $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.', 'wpsc' ) );
78	} elseif ( !is_email( $user_email ) ) {
79	+ $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn’t correct.', 'wpsc' ) );
80	$user_email = '';
81	} elseif ( email_exists( $user_email ) ) {
82	+ $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.', 'wpsc' ) );
83	}
84
85	if ( $errors->get_error_code() ) {

87	}
88	$user_id = wp_create_user( $user_login, $user_pass, $user_email );
89	if ( !$user_id ) {
90	+ $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'wpsc' ), get_option( 'admin_email' ) ) );
91	return $errors;
92	}
93	$credentials = array( 'user_login' => $user_login, 'user_password' => $user_pass, 'remember' => true );

761	foreach ( $sizes as $size ) {
762	// very, very rough estimation
763	if ( $freeMemory < round( $size['width'] * $size['height'] * 5.09 ) ) {
764	+ $result = sprintf( __( 'Please refrain from uploading images larger than <strong>%d x %d</strong> pixels', 'wpsc' ), $size['width'], $size['height'] );
765	return $result;
766	}
767	}

wpsc-includes/processing.functions.php CHANGED Viewed

	@@ -29,12 +29,12 @@ function wpsc_currency_display( $price_in, $args = null ) {
29	if('' == get_option('wpsc_decimal_separator'))
30	$decimal_separator = '.';
31	else
32	- $decimal_separator = get_option('wpsc_decimal_separator');
33
34	if('' == get_option('wpsc_thousands_separator'))
35	$thousands_separator = '.';
36	else
37	- $thousands_separator = get_option('wpsc_thousands_separator');
38
39	// Format the price for output
40	$price_out = number_format( (double)$price_in, $decimals, $decimal_separator, $thousands_separator );
	@@ -54,8 +54,8 @@ function wpsc_currency_display( $price_in, $args = null ) {
54	$currency_sign = '';
55	if ( $query['display_currency_symbol'] ) {
56	if ( !empty( $wpsc_currency_data['symbol'] ) ) {
57	- if ( $query['display_as_html'] ) {
58	- $currency_sign = ~~html_entity_decode(~~$wpsc_currency_data['~~symbol~~']);
59	} else {
60	$currency_sign = $wpsc_currency_data['symbol'];
61	}
	@@ -83,7 +83,7 @@ function wpsc_currency_display( $price_in, $args = null ) {
83
84	case 3:
85	default:
86	- $format_string = '%1$s %2$s %3$s';
87	break;
88	}
89	// Compile the output
	@@ -173,32 +173,14 @@ function wpsc_get_mimetype($file, $check_reliability = false) {
173	}
174
175	function wpsc_convert_weights($weight, $unit) {

176	if (is_array($weight)) {
177	$weight = $weight['weight'];
178	}
179	- ~~switch~~($unit) {
180	- case "kilogram":
181	- $weight = $weight / 1000;
182	- break;
183	-
184	- case "gram":
185	- $weight = $weight;
186	- break;
187	-
188	- case "once":
189	- case "ounce":
190	- $weight = ($weight / 453.59237) * 16;
191	- break;
192	-
193	- case "pound":
194	- default:
195	- $weight = $weight / 453.59237;
196	- break;
197	- }
198	- return $weight;
199	}
200
201	- function wpsc_convert_weight($in_weight, $in_unit, $out_unit = 'pound') {
202	if (isset($weight) && is_array($weight)) {
203	$weight = $weight['weight'];
204	}
	@@ -241,6 +223,8 @@ function wpsc_convert_weight($in_weight, $in_unit, $out_unit = 'pound') {
241	$weight = $intermediate_weight / 453.59237;
242	break;
243	}


244	return round($weight, 2);
245	}
246


29	if('' == get_option('wpsc_decimal_separator'))
30	$decimal_separator = '.';
31	else
32	+ $decimal_separator = stripslashes( get_option('wpsc_decimal_separator') );
33
34	if('' == get_option('wpsc_thousands_separator'))
35	$thousands_separator = '.';
36	else
37	+ $thousands_separator = stripslashes( get_option('wpsc_thousands_separator') );
38
39	// Format the price for output
40	$price_out = number_format( (double)$price_in, $decimals, $decimal_separator, $thousands_separator );

54	$currency_sign = '';
55	if ( $query['display_currency_symbol'] ) {
56	if ( !empty( $wpsc_currency_data['symbol'] ) ) {
57	+ if ( $query['display_as_html'] && !empty($wpsc_currency_data['symbol_html']) ) {
58	+ $currency_sign = $wpsc_currency_data['symbol_html'];
59	} else {
60	$currency_sign = $wpsc_currency_data['symbol'];
61	}

83
84	case 3:
85	default:
86	+ $format_string = '%1$s %2$s%3$s';
87	break;
88	}
89	// Compile the output

173	}
174
175	function wpsc_convert_weights($weight, $unit) {
176	+ _deprecated_function( __FUNCTION__, '3.8', 'wpsc_convert_weight' );
177	if (is_array($weight)) {
178	$weight = $weight['weight'];
179	}
180	+ return wpsc_convert_weight( $weight, $unit, 'gram', true );



















181	}
182
183	+ function wpsc_convert_weight($in_weight, $in_unit, $out_unit = 'pound', $raw = false) {
184	if (isset($weight) && is_array($weight)) {
185	$weight = $weight['weight'];
186	}

223	$weight = $intermediate_weight / 453.59237;
224	break;
225	}
226	+ if($raw)
227	+ return $weight;
228	return round($weight, 2);
229	}
230

wpsc-includes/product-template.php CHANGED Viewed

	@@ -91,15 +91,16 @@ function wpsc_pagination($totalpages = '', $per_page = '', $current_page = '', $
91	$totalpages = $wp_query->max_num_pages;
92	}
93	if(empty($per_page))
94	- $per_page = get_option('wpsc_products_per_page');
95
96	- $current_page = get_query_var('paged');
97	if($current_page == 0)
98	$current_page = 1;
99
100	if(empty($page_link))
101	$page_link = wpsc_a_page_url();
102

103	if(!get_option('permalink_structure')) {
104	$category = '?';
105	if(isset($wpsc_query->query_vars['wpsc_product_category']))
	@@ -128,56 +129,116 @@ function wpsc_pagination($totalpages = '', $per_page = '', $current_page = '', $
128	// Pagination Prefix
129	$output = __('Pages: ','wpsc');
130
131	- ~~// Should we show the FIRST PAGE link?~~
132	- ~~if($current_page~~ > 1)
133	- $~~output~~ ~~.= "<a href=\"". $page_link . $additional_links . "\" title=\"" . __('First Page', 'wpsc') . "\"~~>" ~~. __('« First', 'wpsc'~~) ~~. "</a>";~~
134	-
135	- ~~// Should we show the PREVIOUS PAGE link?~~
136	- ~~if($current_page~~ > 2) {
137	- $~~previous_page = $~~current_page - 1;
138	- $~~output .= " <a href=\"". $page_link .$separator. $~~previous_page . $~~additional_links~~ . ~~"\" title=\"" . __('Previous Page', 'wpsc') . "\">" . __('&lt~~; ~~Previous', 'wpsc') . "</a>";~~
139	- }
140	- $i ~~=$current_page~~ - $~~num_paged_links~~;
141	- $count = 1;
142	- if($i <= 0) $i =1;
143	- while($i < $current_page){
144	- if($count <= $num_paged_links){
145	- if($count == 1)
146	- $output .= " <a href=\"". $page_link . $additional_links . "\" title=\"" . sprintf( __('Page %s', 'wpsc'), $i ) . " \">".$i."</a>";
147	else
148	- $output .= " <a href=\"". $page_link .$separator. $i . $additional_links . "\" title=\"" . ~~sprintf(~~ __('Page %s', 'wpsc'), ~~$i )~~ . " \">"~~.$i~~."</a>";
149	}
150	- $i~~++;~~
151	- $count~~++;~~
152	- }
153	- // ~~Current~~ ~~Page Number~~
154	- if($~~current_page~~ > 0)
155	- $~~output~~ .= ~~"<span class='current'>$current_page</span>";~~
156	-
157	- ~~//Links after Current Page~~
158	- $i = $~~current_page~~ + $~~num_paged_links~~;
159	- ~~$count = 1;~~
160	-
161	- if($current_page < $totalpages){
162	- while(($i) > $current_page){
163	-
164	- if($count < $num_paged_links && ($count+$current_page) <= $totalpages){
165	- $output .= " <a href=\"". $page_link .$separator. ($count+$current_page) .$additional_links . "\" title=\"" . sprintf( __('Page %s', 'wpsc'), ($count+$current_page) ) . "\">".($count+$current_page)."</a>";
166	$i++;
167	- ~~}else{~~
168	- ~~break;~~


















169	}
170	- $count ++;
171	}
172	- }





































173
174	- ~~if($current_page~~ < ~~$totalpages)~~ {
175	- $~~next_page~~ = $current_page + 1;
176	- $~~output~~ .= ~~"<a href=\"". $page_link .$separator. $next_page . $additional_links . "\" title=\"" . __('Next Page', 'wpsc') . "\">" . __('Next &gt~~;~~', 'wpsc') . "</a>";~~
177	- }
178	- // ~~Should~~ ~~we show the LAST PAGE link?~~
179	- if($~~current_page~~ < $~~totalpages~~) {
180	- ~~$output .= "<a href=\"". $page_link .$separator. $totalpages . $additional_links . "\" title=\"" . __('Last Page', 'wpsc') . "\">" . __('Last »', 'wpsc') . "</a>";~~


















181	}
182	// Return the output.
183	echo $output;
	@@ -294,7 +355,7 @@ function wpsc_product_variation_price_available($product_id){
294	AND
295	`p`.`post_parent` = ' . $product_id . '
296	AND
297	- `pm`.`meta_key` = "_wpsc_price"
298	AND
299	`p`.`ID` IN (
300	SELECT `' . $wpdb->postmeta . '`.`post_id` FROM `' . $wpdb->postmeta . '` WHERE `meta_key` = "_wpsc_stock" AND `meta_value` != "0"
	@@ -397,8 +458,10 @@ function wpsc_display_categories() {
397	// if we have no categories, and no search, show the group list
398	if ( is_numeric( get_option( 'wpsc_default_category' ) ) \|\| (isset( $product_id ) && is_numeric( $product_id )) \|\| (isset( $_GET['product_search'] ) && $_GET['product_search'] != '') )
399	$output = true;
400	-
401	- if ( ~~(get_option( 'wpsc_default_category' ) == 'all+list') \|\| (get_option( 'wpsc_default_category' ) == 'list') )~~


402	$output = true;
403
404	}
	@@ -407,6 +470,7 @@ function wpsc_display_categories() {
407	$output = false;
408	if ( get_option( 'wpsc_display_categories' ))
409	$output = true;

410	return $output;
411	}
412
	@@ -628,7 +692,7 @@ function wpsc_the_product_title() {
628	* @return string - the product description
629	*/
630	function wpsc_the_product_description() {
631	- $content = get_the_content( 'Read the rest of this entry »' );
632	return wpautop($content,1);
633	}
634
	@@ -668,7 +732,7 @@ function wpsc_product_external_link( $id = null ) {
668	$product_meta = get_post_meta( $id, '_wpsc_product_metadata', true );
669	if ( isset( $product_meta['external_link'] ) ) {
670	$external_link = $product_meta['external_link'];
671	- return $external_link;
672	}
673	}
674
	@@ -691,7 +755,7 @@ function wpsc_product_external_link_text( $id = null, $default = null ) {
691	if ( isset( $product_meta['external_link_text'] ) && !empty( $product_meta['external_link_text'] ) ) {
692	$external_link_text = $product_meta['external_link_text'];
693	}
694	- return $external_link_text;
695	}
696
697	/**
	@@ -708,7 +772,7 @@ function wpsc_product_external_link_target( $id = null, $external_link_target =
708	if ( isset( $product_meta['external_link_target'] ) && !empty( $product_meta['external_link_target'] ) ) {
709	$external_link_target = $product_meta['external_link_target'];
710	}
711	- return $external_link_target;
712	}
713
714	/**
	@@ -723,7 +787,7 @@ function wpsc_product_sku( $id = null ) {
723
724	$product_sku = get_post_meta( $id, '_wpsc_sku', true );
725
726	- return $product_sku;
727	}
728
729	/**
	@@ -862,7 +926,7 @@ function wpsc_product_remaining_stock( $id = null ) {
862
863	if ( is_numeric( $is_limited_stock ) ) {
864	$product_stock = get_post_meta( $id, '_wpsc_stock', true );
865	- return $product_stock;
866	} else {
867	return null;
868	}
	@@ -968,7 +1032,7 @@ function wpsc_product_postage_and_packaging() {
968	$id = get_the_ID();
969
970	$product_meta = get_post_meta( $id, '_wpsc_product_metadata', true );
971	- if ( is_array( $product_meta['shipping'] ) && 1 != $product_meta['no_shipping'])
972	return wpsc_currency_display( $product_meta['shipping']['local'] );
973	else
974	return wpsc_currency_display( 0 );
	@@ -982,7 +1046,7 @@ function wpsc_product_postage_and_packaging() {
982	*/
983	function wpsc_product_normal_price($forRSS = false) {
984	global $wpsc_query, $wpdb, $wpsc_variations;
985	- if ( count( $wpsc_variations->first_variations ) > 0 ) {
986	//select the variation ID with lovest price
987	$product_id = $wpdb->get_var('SELECT `posts`.`id` FROM ' . $wpdb->posts . ' `posts` JOIN ' . $wpdb->postmeta . ' `postmeta` ON `posts`.`id` = `postmeta`.`post_id` WHERE `posts`.`post_parent` = ' . get_the_ID() . ' AND `posts`.`post_type` = "wpsc-product" AND `posts`.`post_status` = "inherit" AND `postmeta`.`meta_key`="_wpsc_price" ORDER BY (`postmeta`.`meta_value`)+0 ASC LIMIT 1');
988	$from = ' from ';
	@@ -1186,7 +1250,7 @@ function wpsc_product_comments() {
1186
1187	if ( (get_option( 'wpsc_comments_which_products' ) == 1 && $enable_for_product == '') \|\| $enable_for_product == 'yes' ) {
1188	$output = "<script>
1189	- var idcomments_acct = '" . get_option( 'wpsc_intense_debate_account_id' ) . "';
1190	var idcomments_post_id = 'product_" . $wpsc_query->product['id'] . "';
1191	var idcomments_post_url = encodeURIComponent('" . wpsc_product_url( $wpsc_query->product['id'], null, false ) . "');
1192	</script>
	@@ -1204,7 +1268,7 @@ function wpsc_product_comments() {
1204	*/
1205	function wpsc_have_custom_meta() {
1206	global $wpsc_custom_meta;
1207	- return $wpsc_custom_meta->have_custom_meta();
1208	}
1209
1210	/**
	@@ -1213,7 +1277,7 @@ function wpsc_have_custom_meta() {
1213	*/
1214	function wpsc_the_custom_meta() {
1215	global $wpsc_custom_meta;
1216	- return $wpsc_custom_meta->the_custom_meta();
1217	}
1218
1219	/**
	@@ -1222,7 +1286,7 @@ function wpsc_the_custom_meta() {
1222	*/
1223	function wpsc_custom_meta_name() {
1224	global $wpsc_custom_meta;
1225	- return $wpsc_custom_meta->custom_meta_values['meta_key'];
1226	}
1227
1228	/**
	@@ -1231,7 +1295,7 @@ function wpsc_custom_meta_name() {
1231	*/
1232	function wpsc_custom_meta_value() {
1233	global $wpsc_custom_meta;
1234	- return $wpsc_custom_meta->custom_meta_values['meta_value'];
1235	}
1236
1237	/**


91	$totalpages = $wp_query->max_num_pages;
92	}
93	if(empty($per_page))
94	+ $per_page = (int)get_option('wpsc_products_per_page');
95
96	+ $current_page = absint( get_query_var('paged') );
97	if($current_page == 0)
98	$current_page = 1;
99
100	if(empty($page_link))
101	$page_link = wpsc_a_page_url();
102
103	+ //if there is no pagination
104	if(!get_option('permalink_structure')) {
105	$category = '?';
106	if(isset($wpsc_query->query_vars['wpsc_product_category']))

129	// Pagination Prefix
130	$output = __('Pages: ','wpsc');
131
132	+ if(get_option('permalink_structure')){
133	+ // Should we show the FIRST PAGE link?
134	+ if($current_page > 1)
135	+ $output .= "<a href=\"". esc_url( $page_link . $additional_links ) . "\" title=\"" . __('First Page', 'wpsc') . "\">" . __('« First', 'wpsc') . "</a>";
136	+
137	+ // Should we show the PREVIOUS PAGE link?
138	+ if($current_page > 1) {
139	+ $previous_page = $current_page - 1;
140	+ if( $previous_page == 1 )
141	+ $output .= " <a href=\"". esc_url( $page_link . $additional_links ) . "\" title=\"" . __('Previous Page', 'wpsc') . "\">" . __('< Previous', 'wpsc') . "</a>";






142	else
143	+ $output .= " <a href=\"". esc_url( $page_link .$separator. $previous_page . $additional_links ) . "\" title=\"" . __('Previous Page', 'wpsc') . "\">" . __('< Previous', 'wpsc') . "</a>";
144	}
145	+ $i =$current_page - $num_paged_links;
146	+ $count = 1;
147	+ if($i <= 0) $i =1;
148	+ while($i < $current_page){
149	+ if($count <= $num_paged_links){
150	+ if($count == 1)
151	+ $output .= " <a href=\"". esc_url( $page_link . $additional_links ) . "\" title=\"" . sprintf( __('Page %s', 'wpsc'), $i ) . " \">".$i."</a>";
152	+ else
153	+ $output .= " <a href=\"". esc_url( $page_link .$separator. $i . $additional_links ) . "\" title=\"" . sprintf( __('Page %s', 'wpsc'), $i ) . " \">".$i."</a>";
154	+ }






155	$i++;
156	+ $count++;
157	+ }
158	+ // Current Page Number
159	+ if($current_page > 0)
160	+ $output .= "<span class='current'>$current_page</span>";
161	+
162	+ //Links after Current Page
163	+ $i = $current_page + $num_paged_links;
164	+ $count = 1;
165	+
166	+ if($current_page < $totalpages){
167	+ while(($i) > $current_page){
168	+
169	+ if($count < $num_paged_links && ($count+$current_page) <= $totalpages){
170	+ $output .= " <a href=\"". esc_url( $page_link .$separator. ($count+$current_page) .$additional_links ) . "\" title=\"" . sprintf( __('Page %s', 'wpsc'), ($count+$current_page) ) . "\">".($count+$current_page)."</a>";
171	+ $i++;
172	+ }else{
173	+ break;
174	+ }
175	+ $count ++;
176	}

177	}
178	+
179	+ if($current_page < $totalpages) {
180	+ $next_page = $current_page + 1;
181	+ $output .= "<a href=\"". esc_url( $page_link .$separator. $next_page . $additional_links ) . "\" title=\"" . __('Next Page', 'wpsc') . "\">" . __('Next >', 'wpsc') . "</a>";
182	+ }
183	+ // Should we show the LAST PAGE link?
184	+ if($current_page < $totalpages) {
185	+ $output .= "<a href=\"". esc_url( $page_link .$separator. $totalpages . $additional_links ) . "\" title=\"" . __('Last Page', 'wpsc') . "\">" . __('Last »', 'wpsc') . "</a>";
186	+ }
187	+ } else {
188	+ // Should we show the FIRST PAGE link?
189	+ if($current_page > 1)
190	+ $output .= "<a href=\"". remove_query_arg('paged' ) . "\" title=\"" . __('First Page', 'wpsc') . "\">" . __('« First', 'wpsc') . "</a>";
191	+
192	+ // Should we show the PREVIOUS PAGE link?
193	+ if($current_page > 1) {
194	+ $previous_page = $current_page - 1;
195	+ if( $previous_page == 1 )
196	+ $output .= " <a href=\"". remove_query_arg( 'paged' ) . $additional_links . "\" title=\"" . __('Previous Page', 'wpsc') . "\">" . __('< Previous', 'wpsc') . "</a>";
197	+ else
198	+ $output .= " <a href=\"". add_query_arg( 'paged', ($current_page - 1) ) . $additional_links . "\" title=\"" . __('Previous Page', 'wpsc') . "\">" . __('< Previous', 'wpsc') . "</a>";
199	+ }
200	+ $i =$current_page - $num_paged_links;
201	+ $count = 1;
202	+ if($i <= 0) $i =1;
203	+ while($i < $current_page){
204	+ if($count <= $num_paged_links){
205	+ if($i == 1)
206	+ $output .= " <a href=\"". remove_query_arg('paged' ) . "\" title=\"" . sprintf( __('Page %s', 'wpsc'), $i ) . " \">".$i."</a>";
207	+ else
208	+ $output .= " <a href=\"". add_query_arg('paged', $i ) . "\" title=\"" . sprintf( __('Page %s', 'wpsc'), $i ) . " \">".$i."</a>";
209	+ }
210	+ $i++;
211	+ $count++;
212	+ }
213	+ // Current Page Number
214	+ if($current_page > 0)
215	+ $output .= "<span class='current'>$current_page</span>";
216
217	+ //Links after Current Page
218	+ $i = $current_page + $num_paged_links;
219	+ $count = 1;
220	+
221	+ if($current_page < $totalpages){
222	+ while(($i) > $current_page){
223	+
224	+ if($count < $num_paged_links && ($count+$current_page) <= $totalpages){
225	+ $output .= " <a href=\"". add_query_arg( 'paged', ($count+$current_page) ) . "\" title=\"" . sprintf( __('Page %s', 'wpsc'), ($count+$current_page) ) . "\">".($count+$current_page)."</a>";
226	+ $i++;
227	+ }else{
228	+ break;
229	+ }
230	+ $count ++;
231	+ }
232	+ }
233	+
234	+ if($current_page < $totalpages) {
235	+ $next_page = $current_page + 1;
236	+ $output .= "<a href=\"". add_query_arg( 'paged', $next_page ) . "\" title=\"" . __('Next Page', 'wpsc') . "\">" . __('Next >', 'wpsc') . "</a>";
237	+ }
238	+ // Should we show the LAST PAGE link?
239	+ if($current_page < $totalpages) {
240	+ $output .= "<a href=\"". add_query_arg( 'paged', $totalpages ) . "\" title=\"" . __('Last Page', 'wpsc') . "\">" . __('Last »', 'wpsc') . "</a>";
241	+ }
242	}
243	// Return the output.
244	echo $output;

355	AND
356	`p`.`post_parent` = ' . $product_id . '
357	AND
358	+ `pm`.`meta_key` = GREATEST("_wpsc_price","_wpsc_special_price")
359	AND
360	`p`.`ID` IN (
361	SELECT `' . $wpdb->postmeta . '`.`post_id` FROM `' . $wpdb->postmeta . '` WHERE `meta_key` = "_wpsc_stock" AND `meta_value` != "0"

458	// if we have no categories, and no search, show the group list
459	if ( is_numeric( get_option( 'wpsc_default_category' ) ) \|\| (isset( $product_id ) && is_numeric( $product_id )) \|\| (isset( $_GET['product_search'] ) && $_GET['product_search'] != '') )
460	$output = true;
461	+ if ( (get_option( 'wpsc_default_category' ) == 'all+list'))
462	+ $output = true;
463	+
464	+ if (get_option( 'wpsc_default_category' ) == 'list' && (!isset($wp_query->query_vars['wpsc_product_category']) \|\| !isset($wp_query->query_vars['product_tag']) && get_option('wpsc_display_categories')))
465	$output = true;
466
467	}

470	$output = false;
471	if ( get_option( 'wpsc_display_categories' ))
472	$output = true;
473	+
474	return $output;
475	}
476

692	* @return string - the product description
693	*/
694	function wpsc_the_product_description() {
695	+ $content = get_the_content( __( 'Read the rest of this entry »', 'wpsc' ) );
696	return wpautop($content,1);
697	}
698

732	$product_meta = get_post_meta( $id, '_wpsc_product_metadata', true );
733	if ( isset( $product_meta['external_link'] ) ) {
734	$external_link = $product_meta['external_link'];
735	+ return esc_url( $external_link );
736	}
737	}
738

755	if ( isset( $product_meta['external_link_text'] ) && !empty( $product_meta['external_link_text'] ) ) {
756	$external_link_text = $product_meta['external_link_text'];
757	}
758	+ return esc_html( $external_link_text );
759	}
760
761	/**

772	if ( isset( $product_meta['external_link_target'] ) && !empty( $product_meta['external_link_target'] ) ) {
773	$external_link_target = $product_meta['external_link_target'];
774	}
775	+ return esc_attr( $external_link_target );
776	}
777
778	/**

787
788	$product_sku = get_post_meta( $id, '_wpsc_sku', true );
789
790	+ return esc_attr( $product_sku );
791	}
792
793	/**

926
927	if ( is_numeric( $is_limited_stock ) ) {
928	$product_stock = get_post_meta( $id, '_wpsc_stock', true );
929	+ return absint( $product_stock );
930	} else {
931	return null;
932	}

1032	$id = get_the_ID();
1033
1034	$product_meta = get_post_meta( $id, '_wpsc_product_metadata', true );
1035	+ if ( isset( $product_meta['shipping'] ) && is_array( $product_meta['shipping'] ) && 1 != $product_meta['no_shipping'])
1036	return wpsc_currency_display( $product_meta['shipping']['local'] );
1037	else
1038	return wpsc_currency_display( 0 );

1046	*/
1047	function wpsc_product_normal_price($forRSS = false) {
1048	global $wpsc_query, $wpdb, $wpsc_variations;
1049	+ if ( is_object($wpsc_variations) && count( $wpsc_variations->first_variations ) > 0 ) {
1050	//select the variation ID with lovest price
1051	$product_id = $wpdb->get_var('SELECT `posts`.`id` FROM ' . $wpdb->posts . ' `posts` JOIN ' . $wpdb->postmeta . ' `postmeta` ON `posts`.`id` = `postmeta`.`post_id` WHERE `posts`.`post_parent` = ' . get_the_ID() . ' AND `posts`.`post_type` = "wpsc-product" AND `posts`.`post_status` = "inherit" AND `postmeta`.`meta_key`="_wpsc_price" ORDER BY (`postmeta`.`meta_value`)+0 ASC LIMIT 1');
1052	$from = ' from ';

1250
1251	if ( (get_option( 'wpsc_comments_which_products' ) == 1 && $enable_for_product == '') \|\| $enable_for_product == 'yes' ) {
1252	$output = "<script>
1253	+ var idcomments_acct = '" . esc_js( get_option( 'wpsc_intense_debate_account_id' ) ) . "';
1254	var idcomments_post_id = 'product_" . $wpsc_query->product['id'] . "';
1255	var idcomments_post_url = encodeURIComponent('" . wpsc_product_url( $wpsc_query->product['id'], null, false ) . "');
1256	</script>

1268	*/
1269	function wpsc_have_custom_meta() {
1270	global $wpsc_custom_meta;
1271	+ return esc_html( $wpsc_custom_meta->have_custom_meta() );
1272	}
1273
1274	/**

1277	*/
1278	function wpsc_the_custom_meta() {
1279	global $wpsc_custom_meta;
1280	+ return esc_html( $wpsc_custom_meta->the_custom_meta() );
1281	}
1282
1283	/**

1286	*/
1287	function wpsc_custom_meta_name() {
1288	global $wpsc_custom_meta;
1289	+ return esc_html( $wpsc_custom_meta->custom_meta_values['meta_key'] );
1290	}
1291
1292	/**

1295	*/
1296	function wpsc_custom_meta_value() {
1297	global $wpsc_custom_meta;
1298	+ return esc_html( $wpsc_custom_meta->custom_meta_values['meta_value'] );
1299	}
1300
1301	/**

wpsc-includes/purchaselogs.class.php CHANGED Viewed

	@@ -23,12 +23,12 @@ function wpsc_display_tracking_id(){
23
24	function wpsc_display_purchlog_howtheyfoundus() {
25	global $purchlogitem;
26	- return $purchlogitem->extrainfo->find_us;
27	}
28
29	function wpsc_display_purchlog_display_howtheyfoundus() {
30	global $purchlogitem;
31	- if ( $purchlogitem->extrainfo->find_us != '' )
32	return true;
33	else
34	return false;
	@@ -57,7 +57,7 @@ function wpsc_purchlogs_has_tracking() {
57
58	function wpsc_purchlogitem_trackid() {
59	global $purchlogitem;
60	- return $purchlogitem->extrainfo->track_id;
61	}
62
63	function wpsc_purchlogitem_trackstatus() {
	@@ -107,7 +107,7 @@ function wpsc_purchlogs_has_customfields( $id = '' ) {
107
108	function wpsc_trackingid_value() {
109	global $purchlogs;
110	- return $purchlogs->purchitem->track_id;
111	}
112
113	function wpsc_purchlogs_custommessages() {
	@@ -128,12 +128,12 @@ function wpsc_purchlogs_customfiles() {
128	$file = unserialize( $cartitem->files );
129
130	if ( $file["mime_type"] == "image/jpeg" \|\| $file["mime_type"] == "image/png" \|\| $file["mime_type"] == "image/gif" ) {
131	- $image = "<a href='" . WPSC_USER_UPLOADS_URL . $file['file_name'] . "' >";
132	- $image .= "<img width='150' src='".WPSC_USER_UPLOADS_URL . $file['file_name']. "' alt='' />";
133	$image .="</a>";
134	$files[] = $cartitem->name . ' :<br />' . $image;
135	} else {
136	- $files[] = $cartitem->name . ' :<br />' . $file['file_name'];
137	}
138	}
139	}
	@@ -243,7 +243,7 @@ function wpsc_the_purch_status_name() {
243	function wpsc_purchlogs_getfirstdates() {
244	global $purchlogs;
245	$dates = $purchlogs->getdates();
246	-
247	foreach ( $dates as $date ) {
248	$is_selected = '';
249	$cleanDate = date( 'M Y', $date['start'] );
	@@ -300,7 +300,7 @@ function wpsc_have_purchaselog_details() {
300
301	function wpsc_purchaselog_details_name() {
302	global $purchlogitem;
303	- return stripslashes( $purchlogitem->purchitem->name );
304	}
305
306	function wpsc_purchaselog_details_id() {
	@@ -317,41 +317,41 @@ function wpsc_purchaselog_details_SKU() {
317	global $purchlogitem;
318	$meta_value = wpsc_get_cartmeta( $purchlogitem->purchitem->id, 'sku' );
319	if ( $meta_value != null ) {
320	- return $meta_value;
321	} else {
322	$meta_value = get_product_meta( $purchlogitem->purchitem->prodid, 'sku', true );
323	if ( $meta_value != null ) {
324	- return $meta_value;
325	} else {
326	- return 'N/A';
327	}
328	}
329	}
330
331	function wpsc_purchaselog_details_quantity() {
332	global $purchlogitem;
333	- return $purchlogitem->purchitem->quantity;
334	}
335
336	function wpsc_purchaselog_details_price() {
337	global $purchlogitem;
338	- return $purchlogitem->purchitem->price;
339	}
340
341	function wpsc_purchaselog_details_shipping() {
342	global $purchlogitem;
343	- return $purchlogitem->purchitem->pnp;
344	}
345
346	function wpsc_purchaselog_details_tax() {
347	global $purchlogitem, $wpsc_cart;
348
349	- return $purchlogitem->purchitem->tax_charged;
350	}
351
352	function wpsc_purchaselog_details_discount() {
353	global $purchlogitem;
354	- return $purchlogitem->extrainfo->discount_value;
355	}
356
357	function wpsc_purchaselog_details_date() {
	@@ -448,12 +448,12 @@ function wpsc_display_purchlog_totalprice() {
448
449	function wpsc_display_purchlog_buyers_name() {
450	global $purchlogitem;
451	- return htmlentities( stripslashes( $purchlogitem->userinfo['billingfirstname']['value'] ), ENT_QUOTES, 'UTF-8') . ' ' . htmlentities( stripslashes( $purchlogitem->userinfo['billinglastname']['value'] ), ENT_QUOTES, 'UTF-8');
452	}
453
454	function wpsc_display_purchlog_buyers_email() {
455	global $purchlogitem;
456	- return htmlentities( stripslashes( $purchlogitem->userinfo['billingemail']['value'] ), ENT_QUOTES, 'UTF-8');
457	}
458
459	function wpsc_display_purchlog_buyers_address() {
	@@ -464,45 +464,53 @@ function wpsc_display_purchlog_buyers_address() {
464	else
465	$state = $purchlogitem->userinfo['billingstate']['value'];
466
467	- return nl2br(trim(htmlentities( stripslashes( $purchlogitem->userinfo['billingaddress']['value'] ), ENT_QUOTES, 'UTF-8'), "\n\r"))~~.'<br />'.htmlentities( stripslashes( $state~~ )~~, ENT_QUOTES, 'UTF-8')~~ .'~~, '.htmlentities( stripslashes( $purchlogitem->userinfo['billingpostcode']['value'] ), ENT_QUOTES, 'UTF-8').'~~<br />'.~~htmlentities( stripslashes( $purchlogitem->extrainfo->billing_country ), ENT_QUOTES, 'UTF-8');~~


468	}
469
470	function wpsc_display_purchlog_buyers_phone() {
471	global $purchlogitem;
472	- return htmlentities( stripslashes( $purchlogitem->userinfo['billingphone']['value'] ), ENT_QUOTES, 'UTF-8');
473	}
474
475	function wpsc_display_purchlog_shipping_name() {
476	global $purchlogitem;
477	- return htmlentities( stripslashes( $purchlogitem->shippinginfo['shippingfirstname']['value'] ), ENT_QUOTES, 'UTF-8') . ' ' . htmlentities( stripslashes( $purchlogitem->shippinginfo['shippinglastname']['value'] ), ENT_QUOTES, 'UTF-8');
478	}
479
480	function wpsc_display_purchlog_shipping_address() {
481	global $purchlogitem;
482	- return nl2br(trim(htmlentities( stripslashes( $purchlogitem->shippinginfo['shippingaddress']['value'] ), ENT_QUOTES, 'UTF-8'), "\n\r"));
483	}
484
485	function wpsc_display_purchlog_shipping_city() {
486	global $purchlogitem;
487	- return htmlentities( stripslashes( $purchlogitem->shippinginfo['shippingcity']['value'] ), ENT_QUOTES, 'UTF-8' );
488	}
489
490	function wpsc_display_purchlog_shipping_state_and_postcode() {
491	global $purchlogitem;
492	-
493	if( is_numeric($purchlogitem->extrainfo->shipping_region) )
494	- $state = wpsc_get_region($purchlogitem->extrainfo->shipping_region);
495	else
496	- $state = $purchlogitem->shippinginfo['shippingstate']['value'];
497
498	- if ( !empty( $~~state ) && !empty( $~~purchlogitem->shippinginfo['shippingpostcode']['value'] ) ) {
499	- ~~return~~ $state . ~~', ' . $purchlogitem->shippinginfo['shippingpostcode']['value'];~~
500	- }






501	}
502
503	function wpsc_display_purchlog_shipping_country() {
504	global $purchlogitem;
505	- return htmlentities( stripslashes( $purchlogitem->shippinginfo['shippingcountry']['value'] ), ENT_QUOTES, 'UTF-8' );
506	}
507
508	function wpsc_display_purchlog_shipping_method() {
	@@ -607,24 +615,18 @@ class wpsc_purchaselogs {
607	var $current_start_timestamp;
608	var $current_end_timestamp;
609
610	- /* Constructor function */
611	- function wpsc_purchaselogs() {
612	-
613	- $~~this->getall_formdata~~();
614	- if ( ~~!isset(~~ $~~_GET['view_purchlogs_by'] ) && !isset~~( ~~$_GET['purchlogs_searchbox']~~ ) ~~) {~~
615	- $dates = $~~this->getdates(~~);
616	- if ( isset( $~~_SESSION~~['~~newlogs~~'] ) ) {
617	- $~~purchaselogs~~ = $~~_SESSION~~['~~newlogs~~'];
618	- } ~~else~~ {
619	- $~~dates~~ = ~~array_slice~~( $dates, ~~0, 3~~ );
620	- $~~this->current_start_timestamp~~ = $~~dates[2]['start']~~;
621	- $this->~~current_end_timestamp~~ = $~~dates[0]['end']~~;
622	- $newlogs = $this->get_purchlogs( $dates, $status );
623	- $_SESSION['newlogs'] = $newlogs;
624	- $this->allpurchaselogs = $newlogs;
625	- }
626	-
627	- $this->allpurchaselogs = $purchaselogs;
628	} else {
629	$this->getdates();
630	if ( isset( $_GET['view_purchlogs_by'] ) && isset( $_GET['view_purchlogs_by_status'] ) ) {
	@@ -645,7 +647,6 @@ class wpsc_purchaselogs {
645	$_SESSION['newlogs'] = $newlogs;
646	$this->allpurchaselogs = $newlogs;
647	} else {
648	-
649	$dates = explode( '_', $viewby );
650	$date[0]['start'] = $dates[0];
651	$date[0]['end'] = $dates[1];
	@@ -858,9 +859,9 @@ class wpsc_purchaselogs {
858	$fname = $wpdb->get_var( $sql );
859	$sql = "SELECT value FROM " . WPSC_TABLE_SUBMITED_FORM_DATA . " WHERE log_id=" . $this->purchitem->id . " AND form_id=" . $lNameformid;
860	$lname = $wpdb->get_var( $sql );
861	- $namestring = $fname . ' ' . $lname . ' (<a href="mailto:' . $email . '?subject=Message From ' . get_option( 'siteurl' ) . '">' . $email . '</a>) ';
862	if ( $fname == '' && $lname == '' && $email == '' ) {
863	- $namestring = 'N/A';
864	}
865	return $namestring;
866	}


23
24	function wpsc_display_purchlog_howtheyfoundus() {
25	global $purchlogitem;
26	+ return esc_attr( $purchlogitem->extrainfo->find_us );
27	}
28
29	function wpsc_display_purchlog_display_howtheyfoundus() {
30	global $purchlogitem;
31	+ if ( !empty( $purchlogitem->extrainfo->find_us ) )
32	return true;
33	else
34	return false;

57
58	function wpsc_purchlogitem_trackid() {
59	global $purchlogitem;
60	+ return esc_attr( $purchlogitem->extrainfo->track_id );
61	}
62
63	function wpsc_purchlogitem_trackstatus() {

107
108	function wpsc_trackingid_value() {
109	global $purchlogs;
110	+ return esc_attr( $purchlogs->purchitem->track_id );
111	}
112
113	function wpsc_purchlogs_custommessages() {

128	$file = unserialize( $cartitem->files );
129
130	if ( $file["mime_type"] == "image/jpeg" \|\| $file["mime_type"] == "image/png" \|\| $file["mime_type"] == "image/gif" ) {
131	+ $image = "<a href='" . esc_url ( WPSC_USER_UPLOADS_URL . $file['file_name'] ) . "' >";
132	+ $image .= "<img width='150' src='".esc_url( WPSC_USER_UPLOADS_URL . $file['file_name'] ). "' alt='' />";
133	$image .="</a>";
134	$files[] = $cartitem->name . ' :<br />' . $image;
135	} else {
136	+ $files[] = $cartitem->name . ' :<br />' . esc_url( $file['file_name'] );
137	}
138	}
139	}

243	function wpsc_purchlogs_getfirstdates() {
244	global $purchlogs;
245	$dates = $purchlogs->getdates();
246	+ $fDate = '';
247	foreach ( $dates as $date ) {
248	$is_selected = '';
249	$cleanDate = date( 'M Y', $date['start'] );

300
301	function wpsc_purchaselog_details_name() {
302	global $purchlogitem;
303	+ return esc_attr( stripslashes( $purchlogitem->purchitem->name ) );
304	}
305
306	function wpsc_purchaselog_details_id() {

317	global $purchlogitem;
318	$meta_value = wpsc_get_cartmeta( $purchlogitem->purchitem->id, 'sku' );
319	if ( $meta_value != null ) {
320	+ return esc_attr( $meta_value );
321	} else {
322	$meta_value = get_product_meta( $purchlogitem->purchitem->prodid, 'sku', true );
323	if ( $meta_value != null ) {
324	+ return esc_attr( $meta_value );
325	} else {
326	+ return __('N/A', 'wpsc');
327	}
328	}
329	}
330
331	function wpsc_purchaselog_details_quantity() {
332	global $purchlogitem;
333	+ return (int)$purchlogitem->purchitem->quantity;
334	}
335
336	function wpsc_purchaselog_details_price() {
337	global $purchlogitem;
338	+ return (float)$purchlogitem->purchitem->price;
339	}
340
341	function wpsc_purchaselog_details_shipping() {
342	global $purchlogitem;
343	+ return (int)$purchlogitem->purchitem->pnp;
344	}
345
346	function wpsc_purchaselog_details_tax() {
347	global $purchlogitem, $wpsc_cart;
348
349	+ return (int)$purchlogitem->purchitem->tax_charged;
350	}
351
352	function wpsc_purchaselog_details_discount() {
353	global $purchlogitem;
354	+ return (float)$purchlogitem->extrainfo->discount_value;
355	}
356
357	function wpsc_purchaselog_details_date() {

448
449	function wpsc_display_purchlog_buyers_name() {
450	global $purchlogitem;
451	+ return esc_attr( htmlentities( stripslashes( $purchlogitem->userinfo['billingfirstname']['value'] ), ENT_QUOTES, 'UTF-8') ) . ' ' . esc_attr( htmlentities( stripslashes( $purchlogitem->userinfo['billinglastname']['value'] ), ENT_QUOTES, 'UTF-8') );
452	}
453
454	function wpsc_display_purchlog_buyers_email() {
455	global $purchlogitem;
456	+ return esc_attr( htmlentities( stripslashes( $purchlogitem->userinfo['billingemail']['value'] ), ENT_QUOTES, 'UTF-8') );
457	}
458
459	function wpsc_display_purchlog_buyers_address() {

464	else
465	$state = $purchlogitem->userinfo['billingstate']['value'];
466
467	+ return nl2br( esc_html( trim(htmlentities( stripslashes( $purchlogitem->userinfo['billingaddress']['value'] ), ENT_QUOTES, 'UTF-8'), "\n\r"))).'<br />'.
468	+ esc_html( htmlentities( stripslashes( $state ), ENT_QUOTES, 'UTF-8') ).', '.
469	+ esc_html( htmlentities( stripslashes( $purchlogitem->userinfo['billingpostcode']['value'] ), ENT_QUOTES, 'UTF-8') ).'<br />'.esc_html( htmlentities( stripslashes( $purchlogitem->extrainfo->billing_country ), ENT_QUOTES, 'UTF-8') ) ;
470	}
471
472	function wpsc_display_purchlog_buyers_phone() {
473	global $purchlogitem;
474	+ return esc_attr( htmlentities( stripslashes( $purchlogitem->userinfo['billingphone']['value'] ), ENT_QUOTES, 'UTF-8') );
475	}
476
477	function wpsc_display_purchlog_shipping_name() {
478	global $purchlogitem;
479	+ return esc_html( htmlentities( stripslashes( $purchlogitem->shippinginfo['shippingfirstname']['value'] ), ENT_QUOTES, 'UTF-8') . ' ' . htmlentities( stripslashes( $purchlogitem->shippinginfo['shippinglastname']['value'] ), ENT_QUOTES, 'UTF-8') );
480	}
481
482	function wpsc_display_purchlog_shipping_address() {
483	global $purchlogitem;
484	+ return nl2br( esc_html( trim(htmlentities( stripslashes( $purchlogitem->shippinginfo['shippingaddress']['value'] ), ENT_QUOTES, 'UTF-8'), "\n\r")) );
485	}
486
487	function wpsc_display_purchlog_shipping_city() {
488	global $purchlogitem;
489	+ return esc_attr( htmlentities( stripslashes( $purchlogitem->shippinginfo['shippingcity']['value'] ), ENT_QUOTES, 'UTF-8' ) );
490	}
491
492	function wpsc_display_purchlog_shipping_state_and_postcode() {
493	global $purchlogitem;
494	+ $state = '';
495	if( is_numeric($purchlogitem->extrainfo->shipping_region) )
496	+ $state = esc_html( wpsc_get_region($purchlogitem->extrainfo->shipping_region) );
497	else
498	+ $state = esc_html( $purchlogitem->shippinginfo['shippingstate']['value'] );
499
500	+ if ( !empty( $purchlogitem->shippinginfo['shippingpostcode']['value'] ) ){
501	+ if( empty( $state ) )
502	+ $state = esc_html( $purchlogitem->shippinginfo['shippingpostcode']['value'] );
503	+ else
504	+ $state .= ', ' . esc_html( $purchlogitem->shippinginfo['shippingpostcode']['value'] );
505	+ }
506	+
507	+
508	+ return $state;
509	}
510
511	function wpsc_display_purchlog_shipping_country() {
512	global $purchlogitem;
513	+ return esc_attr( htmlentities( stripslashes( $purchlogitem->shippinginfo['shippingcountry']['value'] ), ENT_QUOTES, 'UTF-8' ) );
514	}
515
516	function wpsc_display_purchlog_shipping_method() {

615	var $current_start_timestamp;
616	var $current_end_timestamp;
617
618	+ /* Constructor function */
619	+ function wpsc_purchaselogs() {
620	+ $this->getall_formdata();
621	+ if ( !isset( $_GET['view_purchlogs_by'] ) && !isset( $_GET['purchlogs_searchbox'] ) ) {
622	+ $dates = $this->getdates();
623	+ $dates = array_slice( $dates, 0, 3 );
624	+ if(isset($dates[2]['start']))
625	+ $this->current_start_timestamp = $dates[2]['start'];
626	+ $this->current_end_timestamp = $dates[0]['end'];
627	+ $newlogs = $this->get_purchlogs( $dates );
628	+ $_SESSION['newlogs'] = $newlogs;
629	+ $this->allpurchaselogs = $newlogs;






630	} else {
631	$this->getdates();
632	if ( isset( $_GET['view_purchlogs_by'] ) && isset( $_GET['view_purchlogs_by_status'] ) ) {

647	$_SESSION['newlogs'] = $newlogs;
648	$this->allpurchaselogs = $newlogs;
649	} else {

650	$dates = explode( '_', $viewby );
651	$date[0]['start'] = $dates[0];
652	$date[0]['end'] = $dates[1];

859	$fname = $wpdb->get_var( $sql );
860	$sql = "SELECT value FROM " . WPSC_TABLE_SUBMITED_FORM_DATA . " WHERE log_id=" . $this->purchitem->id . " AND form_id=" . $lNameformid;
861	$lname = $wpdb->get_var( $sql );
862	+ $namestring = esc_html( $fname ) . ' ' . esc_html( $lname ) . ' (<a href="mailto:' . esc_attr( $email ) . '?subject=Message From ' . get_option( 'siteurl' ) . '">' . esc_html( $email ) . '</a>) ';
863	if ( $fname == '' && $lname == '' && $email == '' ) {
864	+ $namestring = __('N/A', 'wpsc');
865	}
866	return $namestring;
867	}

wpsc-includes/shipping.helper.php ADDED Viewed

	@@ -0,0 +1,585 @@


1	+ <?php
2	+
3	+ class ASHXML{
4	+ /**
5	+ * This function iterates over the keys from an array, if there is any
6	+ * non-numeric keys, it is associative, else it is a "list"
7	+ * @author Greg Gullett (greg@ecsquest.com)
8	+ * @since 0.0.1
9	+ * @param array $data
10	+ * @return boolean
11	+ */
12	+ function _is_list($data){
13	+ $is_num = TRUE;
14	+ if (!is_array($data)){ return FALSE; }
15	+ foreach((array)$data as $key=>$value){
16	+ if (!is_numeric($key)){
17	+ $is_num = FALSE;
18	+ }
19	+ }
20	+ return $is_num;
21	+ }
22	+
23	+ /**
24	+ * Helper function that parses xml attributes from an array into a string
25	+ * @author Greg Gullett (greg@ecsquest.com)
26	+ * @since 0.0.1
27	+ * @param array $attrs
28	+ * @return string
29	+ */
30	+ function _parse_attrs($attrs){
31	+ $attrString = "";
32	+ foreach($attrs as $key=>$value){
33	+ $attrString .= sprintf(" %s=\"%s\" ",$key, $value);
34	+ }
35	+ return $attrString;
36	+ }
37	+
38	+ /**
39	+ * Accepts an associative array and produces an XML document
40	+ * Attributes are supported by this function, see example.
41	+ * @author Greg Gullett (greg@ecsquest.com)
42	+ * @since 0.0.1
43	+ * @param array $data Associative array, can be multi-dimensional
44	+ * @return string The resulting XML document
45	+ *
46	+ * Example: (Not a valid USPS Request)
47	+ * $test = array("RateRequestV4"=>array("@attr"=>array("ID"=>"This is my ID", "PASSWORD"=>"this is my pass")
48	+ * "Package"=>array(array("Weight"=>1.0, "Service"=>"First Class"),
49	+ * array("Weight"=>1.0, "Service"=>"PRIORITY"))
50	+ * )
51	+ * );
52	+ * $xml_doc = $this->build_message($test);
53	+ * -- Result --
54	+ * <RateRequestV4 ID="This is my ID" PASSWORD="this is my pass">
55	+ * <Package>
56	+ * <Weight>1.0</Weight>
57	+ * <Service>First Class</Service>
58	+ * </Package>
59	+ * <Package>
60	+ * <Weight>1.0</Weight>
61	+ * <Service>PRIORITY</Service>
62	+ * </Package>
63	+ * </RateRequestV4>
64	+ */
65	+ function build_message(array $data){
66	+ $xmlString = "";
67	+ foreach($data as $node=>$value){
68	+ if ($node == "@attr") { continue; }
69	+ $value_is_list = $this->_is_list($value);
70	+ if (is_array($value) && !$value_is_list){
71	+ $attrs = "";
72	+ if (array_key_exists("@attr",$value)){
73	+ $attrs = $this->_parse_attrs($value["@attr"]);
74	+ unset($value["@attr"]);
75	+ }
76	+ $xmlString .= "<".$node." ".$attrs.">\n";
77	+ $xmlString .= $this->build_message($value);
78	+ $xmlString .= "</".$node.">\n";
79	+
80	+ }elseif(is_array($value) && $value_is_list){
81	+ foreach($value as $iter_node){
82	+ $temp = array($node=>$iter_node);
83	+ $xmlString .= $this->build_message($temp);
84	+ }
85	+ }else{
86	+ if (trim($value) != ""){
87	+ $xmlString .= "<".$node.">".$value."</".$node.">\n";
88	+ }else{
89	+ $xmlString .= "<".$node."/>\n";
90	+ }
91	+ }
92	+ }
93	+ return $xmlString;
94	+ }
95	+
96	+ /**
97	+ * Sets the header content type to text/xml and displays a given XML doc
98	+ * @author Greg Gullett (greg@ecsquest.com)
99	+ * @since 0.0.1
100	+ * @param string $xml_doc
101	+ */
102	+ function show_xml($xml_doc){
103	+ header("content-type: text/xml");
104	+ print $xml_doc;
105	+ }
106	+
107	+ /**
108	+ * This is a helper function that retrieves an XML element from the
109	+ * provided document. Since we are trying to keep PHP4 support
110	+ * I cannot use simpleXML
111	+ * @author Greg Gullett (greg@ecsquest.com)
112	+ * @since 0.0.1
113	+ * @param string $element The element to find in document
114	+ * @param string $document The XML Document to search
115	+ */
116	+ function get($element, $document){
117	+ preg_match_all('/<'.$element.'.?>(.?)<\/'.$element.'>/', $document, $matches);
118	+
119	+ if (count($matches) > 1){
120	+ return $matches[1];
121	+ }
122	+ return FALSE;
123	+ }
124	+
125	+ }
126	+
127	+ /**
128	+ *
129	+ * This is a helper class for ASH-based / enabled Shipping plugins.
130	+ * Helpful centralized functions will be stored here for ease of use.
131	+ * @author Greg Gullett (greg@ecsquest)
132	+ * @since 0.0.1
133	+ */
134	+ class ASHTools{
135	+ /**
136	+ * Determines if the given zipcode is a US Military APO/AFO zip code
137	+ * @author Greg Gullett (greg@ecsquest.com)
138	+ * @since 0.0.1
139	+ * @param int $zipcode
140	+ * @return boolean
141	+ */
142	+ function is_military_zip($zipcode){
143	+ $zips = array("09302","09734","96201","96202","96203","96204","96205","96206","96206","96207",
144	+ "96208","96212","96213","96214","96215","96217","96218","96219","96220","96221",
145	+ "96224","96251","96257","96258","96259","96260","96262","96264","96266","96267",
146	+ "96269","96271","96275","96276","96278","96283","96284","96297","96306","96309",
147	+ "96309","96310","96311","96311","96313","96319","96321","96322","96323","96326",
148	+ "96328","96330","96336","96337","96338","96339","96339","96343","96347","96348",
149	+ "96349","96350","96351","96351","96362","96365","96367","96368","96370","96372",
150	+ "96373","96374","96375","96376","96377","96378","96379","96384","96386","96387",
151	+ "96388","96388","96401","96402","96403","96404","96424","96425","96426","96427",
152	+ "96490","96507","96507","96511","96515","96515","96517","96517",
153	+ "96518","96520","96520","96521","96522","96530","96531","96531","96534","96535",
154	+ "96536","96537","96538","96540","96541","96542","96543","96544","96546","96548",
155	+ "96549","96550","96551","96553","96554","96555","96557","96557","96595","96595",
156	+ "96598","96599","96601","96602","96603","96604","96605","96606","96607","96608",
157	+ "96609","96610","96611","96612","96613","96613","96614","96614","96615","96615",
158	+ "96616","96616","96617","96617","96619","96619","96620","96620","96621","96622",
159	+ "96623","96624","96628","96629","96634","96635","96643","96657","96657","96660",
160	+ "96661","96662","96663","96664","96665","96666","96667","96668","96669","96670",
161	+ "96671","96672","96673","96674","96675","96677","96678","96679","96681","96681",
162	+ "96682","96683","96684","96684","96686","96687","96698");
163	+
164	+ if (in_array($zipcode, $zips)){
165	+ return TRUE;
166	+ }else{
167	+ return FALSE;
168	+ }
169	+ }
170	+
171	+ /**
172	+ * Given an ISO country code, it will return the full country name
173	+ * @author Greg Gullett (greg@ecsquest.com)
174	+ * @since 0.0.1
175	+ * @param string $short_country
176	+ * @return string
177	+ */
178	+ function get_full_country($short_country){
179	+ global $wpdb;
180	+ if (!isset($wpdb)){
181	+ return $short_country;
182	+ }
183	+ $full_name = $wpdb->get_var("SELECT country
184	+ FROM ".WPSC_TABLE_CURRENCY_LIST."
185	+ WHERE isocode='".$short_country."'");
186	+ return $full_name;
187	+ }
188	+
189	+ /**
190	+ * Given a WPEC state code (int), will return the state/region name
191	+ * @author Greg Gullett (greg@ecsquest.com)
192	+ * @since 0.0.1
193	+ * @param int $state_code
194	+ * @return string\|int will be int if wordpress database & wpec are not available
195	+ */
196	+ function get_state($state_code){
197	+ global $wpdb;
198	+ if (!defined("WPSC_TABLE_REGION_TAX")){
199	+ return $state_code;
200	+ }
201	+ $query ="SELECT `".WPSC_TABLE_REGION_TAX."`.* FROM `".WPSC_TABLE_REGION_TAX."`
202	+ WHERE `".WPSC_TABLE_REGION_TAX."`.`id` = '".$_POST['region']."'";
203	+ $dest_region_data = $wpdb->get_results($query, ARRAY_A);
204	+ return (is_array($dest_region_data)) ? $dest_region_data[0]['code'] : "";
205	+ }
206	+
207	+ /**
208	+ * Retrieves value for given key from $_POST or given session variable
209	+ * You need to provide the session stub b/c it doenst know where you are looking
210	+ * @author Greg Gullett (greg@ecsquest.com)
211	+ * @since 0.0.1
212	+ * @param mixed $key
213	+ * @param array $session
214	+ * @return mixed
215	+ */
216	+ function post_or_session($key, $session){
217	+ if (array_key_exists($key, $_POST)){
218	+ return $_POST[$key];
219	+ }elseif(array_key_exists($key, $session)){
220	+ return $session[$key];
221	+ }
222	+ }
223	+
224	+ /**
225	+ * Retrieves the destination from session or post as an array
226	+ * or "state","country", and "zipcode"
227	+ * @author Greg Gullett (greg@ecsquest.com)
228	+ * @since 0.0.1
229	+ * @param array $session
230	+ * @return array
231	+ */
232	+ function get_destination($session){
233	+ $address = array("state"=>$this->get_state($this->post_or_session("region",$session)),
234	+ "country"=>$this->post_or_session("country",$session),
235	+ "zipcode"=>$this->post_or_session("zipcode",$session)
236	+ );
237	+ return $address;
238	+ }
239	+ }
240	+
241	+ /**
242	+ * Object representation of a package from a shipment.
243	+ * This is the fundamental element of a shipment.
244	+ * @author Greg Gullett (greg@ecsquest.com)
245	+ * @since 0.0.1
246	+ */
247	+ class ASHPackage{
248	+ /**
249	+ * Weight in pounds of the package
250	+ * @var decimal
251	+ */
252	+ var $weight;
253	+ /**
254	+ * The height in inches of the package
255	+ * @var decimal
256	+ */
257	+ var $height;
258	+ /**
259	+ * The length (longest part) of the package in inches
260	+ * @var decimal
261	+ */
262	+ var $length;
263	+ /**
264	+ * The width of the package in inches
265	+ * @var decimal
266	+ */
267	+ var $width;
268	+ /**
269	+ * Girth is defined, for a rectangle as G=2(Height+Width)
270	+ * is auto calc'ed when you use set_dimensions
271	+ * @var decimal
272	+ */
273	+ var $girth;
274	+ /**
275	+ * Whatever you want to describe what is in the package
276	+ * @var string
277	+ */
278	+ var $contents;
279	+ /**
280	+ * The value/price of the item/package
281	+ * @var decimal
282	+ */
283	+ var $value;
284	+ /**
285	+ * Flag denotes if the package has hazardous material or not
286	+ * @var boolean
287	+ */
288	+ var $hazard = FALSE;
289	+ /**
290	+ * Flag denotes if the package is to have insurance added to the quote
291	+ * @var boolean
292	+ */
293	+ var $insurance = FALSE;
294	+ /**
295	+ * The amount that the package is to be insured for
296	+ * @var decimal
297	+ */
298	+ var $insured_amount;
299	+
300	+ /**
301	+ * The constructor for the ASHPackage class
302	+ * Accepts an arguments array to fill out the class on initialization
303	+ * @author Greg Gullett (greg@ecsquest.com)
304	+ * @since 0.0.1
305	+ * @param array $args
306	+ */
307	+ function ASHPackage(array $args = array()){
308	+ foreach($args as $key=>$value){
309	+ $this->$key=$value;
310	+ }
311	+ }
312	+ /**
313	+ * This is a "magic function" that will be used when I can convert to PHP5
314	+ * When a property / function is set to private, this controls access
315	+ * to outside functions
316	+ * @author Greg Gullett (greg@ecsquest.com)
317	+ * @since 0.0.1
318	+ * @param string $item
319	+ * @return mixed
320	+ */
321	+ function __get($item){
322	+ return $this->$item;
323	+ }
324	+
325	+ /**
326	+ * This is a "magic function" that sets a property that has as protected scope
327	+ * only for php5
328	+ * @author Greg Gullett (greg@ecsquest.com)
329	+ * @since 0.0.1
330	+ * @param string $item
331	+ * @param mixed $value
332	+ */
333	+ function __set($item, $value){
334	+ $this->$item = $value;
335	+ }
336	+
337	+ /**
338	+ * This is a magic function that controls how the string representation of
339	+ * the class looks / behaves.
340	+ * @author Greg Gullett (greg@ecsquest.com)
341	+ * @since 0.0.1
342	+ */
343	+ function __toString(){
344	+ // Nothing here yet
345	+ }
346	+
347	+ /**
348	+ * Sets the dimensions for the package given an array
349	+ * array values should be "Height", "Length", "Width" and weight
350	+ * girth is automatically calculated
351	+ * @author Greg Gullett (greg@ecsquest.com)
352	+ * @since 0.0.1
353	+ * @param array $dimensions
354	+ */
355	+ function set_dimensions(array $dimensions){
356	+ foreach($dimensions as $key=>$value){
357	+ $this->$key = $value;
358	+ }
359	+ $this->girth = 2*($this->width+$this->height);
360	+ }
361	+
362	+ }
363	+
364	+ /**
365	+ * Object representation of a shipment of packages based on
366	+ * the contents of a shopping cart
367	+ * @author Greg Gullett (greg@ecsquest.com)
368	+ * @since 0.0.1
369	+ */
370	+ class ASHShipment{
371	+ /**
372	+ * An array of ASHPackage objects
373	+ * @var array
374	+ */
375	+ var $packages=array();
376	+ /**
377	+ * Flag denotes if there are any hazardous packages in the shipment overall
378	+ * @var boolean
379	+ */
380	+ var $hazard = FALSE;
381	+ /**
382	+ * The amount of packages in the shipment, automatically increments when
383	+ * you use the add_package() function
384	+ * @var int
385	+ */
386	+ var $package_count=0;
387	+ /**
388	+ * An array that represents the destination, (State,Zipode,Country)
389	+ * @var array
390	+ */
391	+ var $destination = array();
392	+ /**
393	+ * The overall value of the contents of the shipment (all packages value summed together)
394	+ * Automatically calculated when you use add_package()
395	+ * @var decimal
396	+ */
397	+ var $shipment_value = 0;
398	+ /**
399	+ * The overal weight of the contents of the shipment (all packages weight summed together)
400	+ * Automaticaly calculated when you use add_package()
401	+ * @var unknown_type
402	+ */
403	+ var $total_weight = 0;
404	+
405	+ /**
406	+ * Constructor for the ASHShipment class
407	+ * @author Greg Gullett (greg@ecsquest.com)
408	+ * @since 0.0.1
409	+ */
410	+ function ASHShipment(){
411	+ }
412	+
413	+ /**
414	+ * Sets the destination array using either post, session or provided array
415	+ * @param string $internal_name internal name of shipping module
416	+ * @param array $dest optional array if you already know destination.
417	+ */
418	+ function set_destination($internal_name, $dest=FALSE){
419	+ if (!$dest){
420	+ $tools = new ASHTools();
421	+ if (!array_key_exists("wpec_ash",$_SESSION)){
422	+ $_SESSION["wpec_ash"] = array();
423	+ }
424	+ $session_destination = (array_key_exists($internal_name,$_SESSION["wpec_ash"]) ? $_SESSION["wpec_ash"][$internal_name]["shipment"]["destination"] : array());
425	+ $this->destination = $tools->get_destination($session_destination);
426	+ }else{
427	+ $this->destination = $dest;
428	+ }
429	+
430	+ }
431	+
432	+ /**
433	+ * This is a magic function that controls access to protected items
434	+ * and allows you to retrieve their values (php5)
435	+ * @param string $item
436	+ * @return mixed
437	+ */
438	+ function __get($item){
439	+ return $this->$item;
440	+ }
441	+
442	+ /**
443	+ * This function sets the hazard flag on the class
444	+ * while it seems inane, i am making sure that the values
445	+ * are truly boolean true or false
446	+ * @param boolean $flag
447	+ */
448	+ function set_hazard($flag){
449	+ if ($flag == TRUE){
450	+ $this->hazard = TRUE;
451	+ }else{
452	+ $this->hazard = FALSE;
453	+ }
454	+ }
455	+
456	+ /**
457	+ * Use this function to add a package object to the shipment.
458	+ * it expects an object of class ASHPackage or throws an exception
459	+ * @author Greg Gullett (greg@ecsquest.com)
460	+ * @since 0.0.1
461	+ * @param ASHPackage $package
462	+ * @throws ErrorException
463	+ */
464	+ function add_package($package){
465	+ if ($package instanceof ASHPackage){
466	+ array_push($this->packages, $package);
467	+ $this->package_count++;
468	+ $this->total_weight += $package->weight;
469	+ $this->shipment_value += $package->value;
470	+ }else{
471	+ $type = gettype($package);
472	+ throw new ErrorException("ASHSHipment expected object of class ASHPackage, got instance of {$type} instead");
473	+ }
474	+ }
475	+
476	+ }
477	+
478	+ /**
479	+ * This is the heart of the Advanced Shipping Helper for WPEC
480	+ * It is the entrypoint for interaction between ASH and WPEC
481	+ * @author Greg Gullett (greg@ecsquest.com)
482	+ */
483	+ class ASH{
484	+ /**
485	+ * General constructor for ASH class
486	+ * @author Greg Gullett (greg@ecsquest.com)
487	+ */
488	+ function ASH(){
489	+ }
490	+
491	+ /**
492	+ * Builds a shipment object representing the cart contents from WPEC
493	+ * @author Greg Gullett (greg@ecsquest.com)
494	+ * @return ASHShipment
495	+ */
496	+ function get_shipment(){
497	+ global $wpdb, $wpsc_cart;
498	+
499	+ $shipment = new ASHShipment();
500	+ if (!$wpsc_cart){
501	+ return $shipment;
502	+ }
503	+
504	+ foreach($wpsc_cart->cart_items as $cart_item){
505	+ $package = new ASHPackage();
506	+ //* Set package dimensions *\\
507	+ $dimensions = get_product_meta($cart_item->product_id, 'dimensions');
508	+ $dim_array = array();
509	+ $dim_array["weight"] = $cart_item->weight;
510	+ $dim_array["height"] = ( !empty( $dimensions["height"] ) && is_numeric( $dimensions["height"] ) ) ? $dimensions["height"] : 1;
511	+ $dim_array["width"] = ( !empty( $dimensions["width"] ) && is_numeric( $dimensions["width"] ) ) ? $dimensions["width"] : 1;
512	+ $dim_array["length"] = ( !empty( $dimensions["length"] ) && is_numeric( $dimensions["length"] ) ) ? $dimensions["length"] : 1;
513	+ $package->set_dimensions($dim_array);
514	+ //* Set other meta *\\
515	+ $package->hazard = (get_product_meta($cart_item->product_id,"ship_hazard") === FALSE) ? FALSE : TRUE;
516	+ $package->insurance = get_product_meta($cart_item->product_id,"ship_insurance");
517	+ $package->insured_amount = get_product_meta($cart_item->product_id,"ship_insured_amount");
518	+ $package->value = $cart_item->unit_price;
519	+ $package->contents = $cart_item->product_name;
520	+
521	+ if ($shipment->hazard === FALSE and $package->hazard === TRUE){
522	+ $shipment->set_hazard(TRUE);
523	+ }
524	+ $quantity = (int)$cart_item->quantity;
525	+
526	+ for($i=1; $i <= $quantity; $i++){
527	+ $shipment->add_package($package);
528	+ }
529	+ }
530	+ return $shipment;
531	+ }
532	+
533	+ /**
534	+ * Caches a result table for the given shipping module
535	+ * @author Greg Gullett (greg@ecsquest.com)
536	+ * @param string $internal_name
537	+ * @param array $rate_table
538	+ * @param ASHShipment $shipment
539	+ */
540	+ function cache_results($internal_name, $rate_table, $shipment){
541	+ $_SESSION["wpec_ash"][$internal_name]["rate_table"] = $rate_table;
542	+ $shipment_vals = array("package_count"=>$shipment->package_count,
543	+ "destination" =>$shipment->destination,
544	+ "total_weight" =>$shipment->total_weight
545	+ );
546	+ $_SESSION["wpec_ash"][$internal_name]["shipment"] = $shipment_vals;
547	+ }
548	+ /**
549	+ * Checks cached results for given shipping module and returns
550	+ * the cached rates if nothing has changed.
551	+ * @author Greg Gullett (greg@ecsquest.com)
552	+ * @param string $internal_name
553	+ * @param ASHShipment $shipment
554	+ */
555	+ function check_cache($internal_name, $shipment){
556	+ if (!array_key_exists("wpec_ash", $_SESSION)){
557	+ return FALSE;
558	+ }
559	+ if (!array_key_exists($internal_name,$_SESSION["wpec_ash"])){
560	+ return FALSE;
561	+ }
562	+ $cached_shipment = $_SESSION["wpec_ash"][$internal_name]["shipment"];
563	+ $shipment_vals = array("package_count"=>$shipment->package_count,
564	+ "destination" =>$shipment->destination,
565	+ "total_weight" =>$shipment->total_weight
566	+ );
567	+ if ($cached_shipment["package_count"] != $shipment->package_count){
568	+ return FALSE;
569	+ }elseif($cached_shipment["destination"] != $shipment_vals["destination"]){
570	+ return FALSE;
571	+ }elseif($cached_shipment["total_weight"] != $shipment_vals["total_weight"]){
572	+ return FALSE;
573	+ }else{
574	+ return $_SESSION["wpec_ash"][$internal_name];
575	+ }
576	+
577	+ }
578	+
579	+ }
580	+ global $wpec_ash;
581	+ $wpec_ash = new ASH();
582	+ global $wpec_ash_xml;
583	+ $wpec_ash_xml = new ASHXML();
584	+ global $wpec_ash_tools;
585	+ $wpec_ash_tools = new ASHTools();

wpsc-includes/shopping_cart_functions.php CHANGED Viewed

	@@ -41,7 +41,7 @@ function wpsc_shopping_cart( $input = null, $override_state = null ) {
41	}
42	if ( $state == 4 ) {
43	echo "<div id='widgetshoppingcart'>";
44	- echo "<h3>" . __( 'Shopping Cart' ) . "$fancy_collapser</h3>";
45	echo " <div id='shoppingcartcontents'>";
46	echo wpsc_shopping_basket_internals( $cart, false, true );
47	echo " </div>";
	@@ -49,7 +49,7 @@ function wpsc_shopping_cart( $input = null, $override_state = null ) {
49	$dont_add_input = true;
50	} else {
51	echo "<div id='sideshoppingcart'>";
52	- echo "<h3>" . __( 'Shopping Cart' ) . "$fancy_collapser</h3>";
53	echo " <div id='shoppingcartcontents'>";
54	if ( isset( $cart ) ) {
55	echo wpsc_shopping_basket_internals( $cart, false, true );
	@@ -66,7 +66,7 @@ function wpsc_shopping_cart( $input = null, $override_state = null ) {
66	$cart = $_SESSION['nzshpcrt_cart'];
67	}
68	echo "<div id='shoppingcart'>";
69	- echo "<h3>" . __( 'Shopping Cart' ) . "$fancy_collapser</h3>";
70	echo " <div id='shoppingcartcontents'>";
71	echo wpsc_shopping_basket_internals( $cart, false, true );
72	echo " </div>";


41	}
42	if ( $state == 4 ) {
43	echo "<div id='widgetshoppingcart'>";
44	+ echo "<h3>" . __( 'Shopping Cart', 'wpsc' ) . "$fancy_collapser</h3>";
45	echo " <div id='shoppingcartcontents'>";
46	echo wpsc_shopping_basket_internals( $cart, false, true );
47	echo " </div>";

49	$dont_add_input = true;
50	} else {
51	echo "<div id='sideshoppingcart'>";
52	+ echo "<h3>" . __( 'Shopping Cart', 'wpsc' ) . "$fancy_collapser</h3>";
53	echo " <div id='shoppingcartcontents'>";
54	if ( isset( $cart ) ) {
55	echo wpsc_shopping_basket_internals( $cart, false, true );

66	$cart = $_SESSION['nzshpcrt_cart'];
67	}
68	echo "<div id='shoppingcart'>";
69	+ echo "<h3>" . __( 'Shopping Cart', 'wpsc' ) . "$fancy_collapser</h3>";
70	echo " <div id='shoppingcartcontents'>";
71	echo wpsc_shopping_basket_internals( $cart, false, true );
72	echo " </div>";

wpsc-includes/theme.functions.php CHANGED Viewed

	@@ -400,13 +400,13 @@ function wpsc_get_the_category_display($slug){
400	* @return $content with wpsc-single_product content if its a single product
401	*/
402	function wpsc_single_template( $content ) {
403	-
404	global $wpdb, $post, $wp_query, $wpsc_query;
405	-
406	- ~~$single_theme_path~~ = ~~wpsc_get_template_file_path(~~ ~~'wpsc-single_product.php'~~ );
407	if((!isset($wp_query->is_product)) && !isset($wp_query->query_vars['wpsc_product_category']))return $content;
408	- if(isset($wpsc_query->query['paged']) && $wpsc_query->post_count <= 1 && $wp_query->is_single != 1){
409


410	remove_filter( "the_content", "wpsc_single_template" );
411	list($wp_query, $wpsc_query) = array( $wpsc_query, $wp_query ); // swap the wpsc_query object
412	$GLOBALS['nzshpcrt_activateshpcrt'] = true;
	@@ -433,9 +433,16 @@ function wpsc_single_template( $content ) {
433	$wp_query->current_post = $wp_query->post_count;
434	return $output;
435	}

436	if ( 'wpsc-product' == $wp_query->post->post_type && !is_archive() && $wp_query->post_count <= 1 ) {
437	remove_filter( "the_content", "wpsc_single_template" );
438	- $~~wpsc_temp_query~~ = ~~new WP_Query~~( ~~array(~~ '~~post__in' => array( $wp_query->post->ID ), 'post_type' => '~~wpsc-~~product~~'~~,'posts_per_page'=>1~~ ) );






439	list( $wp_query, $wpsc_temp_query ) = array( $wpsc_temp_query, $wp_query ); // swap the wpsc_query object
440	ob_start();
441	include( $single_theme_path );
	@@ -444,6 +451,7 @@ function wpsc_single_template( $content ) {
444	list( $wp_query, $wpsc_temp_query ) = array( $wpsc_temp_query, $wp_query ); // swap the wpsc_query objects back
445
446	}elseif( is_archive() && wpsc_is_viewable_taxonomy() \|\| ($wp_query->post_count > 1 && 1 == $wp_query->is_product)){

447	remove_filter( "the_content", "wpsc_single_template" );
448	list( $wp_query, $wpsc_query ) = array( $wpsc_query, $wp_query ); // swap the wpsc_query object
449	if(isset($wp_query->query['pagename']))
	@@ -473,6 +481,7 @@ function wpsc_is_viewable_taxonomy(){
473	else
474	return false;
475	}

476	/**
477	* Checks and replaces the Page title with the category title if on a category page
478	* @access public
	@@ -485,9 +494,9 @@ function wpsc_is_viewable_taxonomy(){
485	function wpsc_the_category_title($title='', $id=''){
486	global $wp_query;
487	$post = get_post($id);
488	-
489	// If its the category page
490	- if( wpsc_is_viewable_taxonomy() && $wp_query->posts[0]->post_title == $post->post_title && $wp_query->is_archive){
491	$category = get_term_by('slug',$wp_query->query_vars['wpsc_product_category'],'wpsc_product_category');
492	remove_filter('the_title','wpsc_the_category_title');
493	}
	@@ -497,20 +506,21 @@ function wpsc_the_category_title($title='', $id=''){
497	$category = get_term_by('slug',$wp_query->query_vars['term'],'product_tag');
498	remove_filter('the_title','wpsc_the_category_title');
499	}
500	- ~~// if its product-page but paginated~~
501	- if~~(empty($category->name)~~ && ~~$wp_query->query_vars['paged']~~ && ~~$wp_query->posts[0]->post_title == $post->post_title && 'wpsc-product' == $wp_query->query_vars['post_type'] ){~~

502	$post_id = wpec_get_the_post_id_by_shortcode('[productspage]');
503	- $post = get_post($post_id);
504	$title = $post->post_title;
505	- remove_filter('the_title','wpsc_the_category_title');
506	}

507	if(!empty($category->name))
508	return $category->name;
509	else
510	return $title;
511	-
512	-
513	}

514	/**
515	* wpsc_the_category_template swaps the template used for product categories with pageif archive template is being used use
516	* @access public
	@@ -847,6 +857,7 @@ if (isset($product_image_size_list)) {
847	}
848	}
849	}

850	}
851	if ( (isset($_GET['brand']) && is_numeric( $_GET['brand'] )) \|\| (get_option( 'show_categorybrands' ) == 3) ) {
852	$brandstate = 'block';
	@@ -936,12 +947,16 @@ function wpsc_display_products_page( $query ) {
936	if(!empty($query['order'])){
937	$args['order'] = $query['order'];
938	}
939	- if(!empty($query['limit_of_items'])){
940	$args['posts_per_page'] = $query['limit_of_items'];
941	}
942	- if(!empty($query['number_per_page'])){
943	$args['posts_per_page'] = $query['number_per_page'];
944	- }




945	if(!empty($query['tag'])){
946	$args['product_tag'] = $query['tag'];
947	}
	@@ -1057,6 +1072,7 @@ function wpsc_products_page( $content = '' ) {
1057	$GLOBALS['post'] = $wp_query->post;
1058	return preg_replace( "/(<p>)\[productspage\](<\/p>)/", $output, $content );
1059	} elseif(is_archive() && wpsc_is_viewable_taxonomy()){

1060	remove_filter( 'the_content', 'wpautop' );
1061	return wpsc_products_page('[productspage]');
1062	} else {
	@@ -1066,7 +1082,10 @@ function wpsc_products_page( $content = '' ) {
1066	function wpsc_all_products_on_page(){
1067	global $wp_query,$wpsc_query;
1068	do_action('wpsc_swap_the_template');
1069	- ~~if(~~$~~wp_query->query_vars['post_type']~~ == '~~wpsc-product' \|\| isset($wp_query->query_vars~~['~~wpsc_product_category']~~) ){



1070	if (isset($wp_query->post_count) && 1 == $wp_query->post_count && file_exists(STYLESHEETPATH.'/single-wpsc-product.php')){
1071	include(STYLESHEETPATH. '/single-wpsc-product.php');
1072	exit();
	@@ -1144,10 +1163,9 @@ function wpsc_user_log( $content = '' ) {
1144	ob_start();
1145
1146	include( wpsc_get_template_file_path('wpsc-user-log.php') );
1147	- $output = ~~ob_get_contents~~();
1148	-
1149	- ~~ob_end_clean~~();
1150	- return preg_replace( "/(<p>)\[userlog\](<\/p>)/", $output, $content );
1151	} else {
1152	return $content;
1153	}
	@@ -1241,7 +1259,6 @@ function add_to_cart_shortcode( $content = '' ) {
1241	return $content;
1242	}
1243	function wpsc_enable_page_filters( $excerpt = '' ) {
1244	- global $wp_query;
1245	add_filter( 'the_content', 'add_to_cart_shortcode', 12 ); //Used for add_to_cart_button shortcode
1246	add_filter( 'the_content', 'wpsc_products_page', 1 );
1247	add_filter( 'the_content', 'wpsc_single_template',12 );
	@@ -1327,7 +1344,6 @@ add_filter( 'body_class', 'wpsc_body_class' );
1327	* @since 3.8
1328	*/
1329	function wpsc_the_sticky_image( $product_id ) {
1330	- global $wpdb;
1331	$attached_images = (array)get_posts( array(
1332	'post_type' => 'attachment',
1333	'numberposts' => 1,
	@@ -1348,8 +1364,10 @@ function wpsc_the_sticky_image( $product_id ) {
1348	return false;
1349	}
1350	}


1351	function is_products_page(){
1352	- global $~~wpdb, $~~post;
1353	$product_page_id = wpec_get_the_post_id_by_shortcode('[productspage]');
1354	if($post->ID == $product_page_id)
1355	return true;
	@@ -1364,7 +1382,7 @@ function is_products_page(){
1364	* @return void
1365	*/
1366	function wpsc_display_featured_products_page() {
1367	- global $~~wpdb,$post, $wpsc_query,$~~wp_query;
1368	$sticky_array = get_option( 'sticky_products' );
1369	if ( (is_front_page() \|\| is_home() \|\| is_products_page() ) && !empty( $sticky_array ) && $wp_query->post_count > 1) {
1370	$query = get_posts( array(


400	* @return $content with wpsc-single_product content if its a single product
401	*/
402	function wpsc_single_template( $content ) {

403	global $wpdb, $post, $wp_query, $wpsc_query;
404	+
405	+ //if we dont belong here exit out straight away
406	if((!isset($wp_query->is_product)) && !isset($wp_query->query_vars['wpsc_product_category']))return $content;

407
408	+ //if we are a paged page
409	+ if(isset($wpsc_query->query['paged']) && $wpsc_query->post_count <= 1 && $wp_query->is_single != 1){
410	remove_filter( "the_content", "wpsc_single_template" );
411	list($wp_query, $wpsc_query) = array( $wpsc_query, $wp_query ); // swap the wpsc_query object
412	$GLOBALS['nzshpcrt_activateshpcrt'] = true;

433	$wp_query->current_post = $wp_query->post_count;
434	return $output;
435	}
436	+ // If we are a single products page
437	if ( 'wpsc-product' == $wp_query->post->post_type && !is_archive() && $wp_query->post_count <= 1 ) {
438	remove_filter( "the_content", "wpsc_single_template" );
439	+ $single_theme_path = wpsc_get_template_file_path( 'wpsc-single_product.php' );
440	+ if( isset( $wp_query->query_vars['preview'] ) && $wp_query->query_vars['preview'])
441	+ $is_preview = 'true';
442	+ else
443	+ $is_preview = 'false';
444	+ $wpsc_temp_query = new WP_Query( array( 'p' => $wp_query->post->ID , 'post_type' => 'wpsc-product','posts_per_page'=>1, 'preview' => $is_preview ) );
445	+
446	list( $wp_query, $wpsc_temp_query ) = array( $wpsc_temp_query, $wp_query ); // swap the wpsc_query object
447	ob_start();
448	include( $single_theme_path );

451	list( $wp_query, $wpsc_temp_query ) = array( $wpsc_temp_query, $wp_query ); // swap the wpsc_query objects back
452
453	}elseif( is_archive() && wpsc_is_viewable_taxonomy() \|\| ($wp_query->post_count > 1 && 1 == $wp_query->is_product)){
454	+ // If we are a category page
455	remove_filter( "the_content", "wpsc_single_template" );
456	list( $wp_query, $wpsc_query ) = array( $wpsc_query, $wp_query ); // swap the wpsc_query object
457	if(isset($wp_query->query['pagename']))

481	else
482	return false;
483	}
484	+
485	/**
486	* Checks and replaces the Page title with the category title if on a category page
487	* @access public

494	function wpsc_the_category_title($title='', $id=''){
495	global $wp_query;
496	$post = get_post($id);
497	+
498	// If its the category page
499	+ if( wpsc_is_viewable_taxonomy() && isset( $wp_query->posts[0] ) && $wp_query->posts[0]->post_title == $post->post_title && $wp_query->is_archive && !is_admin()){
500	$category = get_term_by('slug',$wp_query->query_vars['wpsc_product_category'],'wpsc_product_category');
501	remove_filter('the_title','wpsc_the_category_title');
502	}

506	$category = get_term_by('slug',$wp_query->query_vars['term'],'product_tag');
507	remove_filter('the_title','wpsc_the_category_title');
508	}
509	+
510	+ //if this is paginated products_page
511	+ if( $wp_query->in_the_loop && empty($category->name) && isset( $wp_query->query_vars['paged'] ) && $wp_query->query_vars['paged'] && isset( $wp_query->query_vars['page'] ) && $wp_query->query_vars['page'] && 'wpsc-product' == $wp_query->query_vars['post_type']){
512	$post_id = wpec_get_the_post_id_by_shortcode('[productspage]');
513	+ $post = get_post($post_id);
514	$title = $post->post_title;
515	+ remove_filter('the_title','wpsc_the_category_title');
516	}
517	+
518	if(!empty($category->name))
519	return $category->name;
520	else
521	return $title;


522	}
523	+
524	/**
525	* wpsc_the_category_template swaps the template used for product categories with pageif archive template is being used use
526	* @access public

857	}
858	}
859	}
860	+ exit();
861	}
862	if ( (isset($_GET['brand']) && is_numeric( $_GET['brand'] )) \|\| (get_option( 'show_categorybrands' ) == 3) ) {
863	$brandstate = 'block';

947	if(!empty($query['order'])){
948	$args['order'] = $query['order'];
949	}
950	+ if(!empty($query['limit_of_items']) && '1' == get_option('use_pagination')){
951	$args['posts_per_page'] = $query['limit_of_items'];
952	}
953	+ if(!empty($query['number_per_page']) && '1' == get_option('use_pagination')){
954	$args['posts_per_page'] = $query['number_per_page'];
955	+ }
956	+ if( '0' == get_option('use_pagination') ){
957	+ $args['nopaging'] = true;
958	+ $args['posts_per_page'] = '-1';
959	+ }
960	if(!empty($query['tag'])){
961	$args['product_tag'] = $query['tag'];
962	}

1072	$GLOBALS['post'] = $wp_query->post;
1073	return preg_replace( "/(<p>)\[productspage\](<\/p>)/", $output, $content );
1074	} elseif(is_archive() && wpsc_is_viewable_taxonomy()){
1075	+
1076	remove_filter( 'the_content', 'wpautop' );
1077	return wpsc_products_page('[productspage]');
1078	} else {

1082	function wpsc_all_products_on_page(){
1083	global $wp_query,$wpsc_query;
1084	do_action('wpsc_swap_the_template');
1085	+ $products_page_id = wpec_get_the_post_id_by_shortcode('[productspage]');
1086	+
1087	+ if($wp_query->query_vars['post_type'] == 'wpsc-product' \|\| isset($wp_query->query_vars['wpsc_product_category']) \|\| ( isset( $wp_query->post ) && $wp_query->post->ID == $products_page_id )){
1088	+
1089	if (isset($wp_query->post_count) && 1 == $wp_query->post_count && file_exists(STYLESHEETPATH.'/single-wpsc-product.php')){
1090	include(STYLESHEETPATH. '/single-wpsc-product.php');
1091	exit();

1163	ob_start();
1164
1165	include( wpsc_get_template_file_path('wpsc-user-log.php') );
1166	+ $output = ob_get_clean();
1167	+ $content = preg_replace( "/(<p>)\[userlog\](<\/p>)/", '[userlog]', $content );
1168	+ return str_replace( '[userlog]', $output, $content );

1169	} else {
1170	return $content;
1171	}

1259	return $content;
1260	}
1261	function wpsc_enable_page_filters( $excerpt = '' ) {

1262	add_filter( 'the_content', 'add_to_cart_shortcode', 12 ); //Used for add_to_cart_button shortcode
1263	add_filter( 'the_content', 'wpsc_products_page', 1 );
1264	add_filter( 'the_content', 'wpsc_single_template',12 );

1344	* @since 3.8
1345	*/
1346	function wpsc_the_sticky_image( $product_id ) {

1347	$attached_images = (array)get_posts( array(
1348	'post_type' => 'attachment',
1349	'numberposts' => 1,

1364	return false;
1365	}
1366	}
1367	+
1368	+
1369	function is_products_page(){
1370	+ global $post;
1371	$product_page_id = wpec_get_the_post_id_by_shortcode('[productspage]');
1372	if($post->ID == $product_page_id)
1373	return true;

1382	* @return void
1383	*/
1384	function wpsc_display_featured_products_page() {
1385	+ global $wp_query;
1386	$sticky_array = get_option( 'sticky_products' );
1387	if ( (is_front_page() \|\| is_home() \|\| is_products_page() ) && !empty( $sticky_array ) && $wp_query->post_count > 1) {
1388	$query = get_posts( array(

wpsc-includes/upgrades.php CHANGED Viewed

	@@ -119,16 +119,16 @@ function _get_upgrade_data_markup_translate($upgrade_file, $upgrade_data, $marku
119	//Apply Markup
120	if ( $markup ) {
121	if ( ! empty($upgrade_data['UpgradeURI']) && ! empty($upgrade_data['Name']) )
122	- $upgrade_data['Title'] = '<a href="' . $upgrade_data['UpgradeURI'] . '" title="' . __( 'Visit upgrade homepage' ) . '">' . $upgrade_data['Name'] . '</a>';
123	else
124	$upgrade_data['Title'] = $upgrade_data['Name'];
125
126	if ( ! empty($upgrade_data['AuthorURI']) && ! empty($upgrade_data['Author']) )
127	- $upgrade_data['Author'] = '<a href="' . $upgrade_data['AuthorURI'] . '" title="' . __( 'Visit author homepage' ) . '">' . $upgrade_data['Author'] . '</a>';
128
129	$upgrade_data['Description'] = wptexturize( $upgrade_data['Description'] );
130	if( ! empty($upgrade_data['Author']) )
131	- $upgrade_data['Description'] .= ' <cite>' . sprintf( __('By %s'), $upgrade_data['Author'] ) . '.</cite>';
132	}
133
134	$upgrades_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());


119	//Apply Markup
120	if ( $markup ) {
121	if ( ! empty($upgrade_data['UpgradeURI']) && ! empty($upgrade_data['Name']) )
122	+ $upgrade_data['Title'] = '<a href="' . $upgrade_data['UpgradeURI'] . '" title="' . __( 'Visit upgrade homepage', 'wpsc' ) . '">' . $upgrade_data['Name'] . '</a>';
123	else
124	$upgrade_data['Title'] = $upgrade_data['Name'];
125
126	if ( ! empty($upgrade_data['AuthorURI']) && ! empty($upgrade_data['Author']) )
127	+ $upgrade_data['Author'] = '<a href="' . $upgrade_data['AuthorURI'] . '" title="' . __( 'Visit author homepage', 'wpsc' ) . '">' . $upgrade_data['Author'] . '</a>';
128
129	$upgrade_data['Description'] = wptexturize( $upgrade_data['Description'] );
130	if( ! empty($upgrade_data['Author']) )
131	+ $upgrade_data['Description'] .= ' <cite>' . sprintf( __('By %s', 'wpsc'), $upgrade_data['Author'] ) . '.</cite>';
132	}
133
134	$upgrades_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());

wpsc-includes/variations.class.php CHANGED Viewed

	@@ -173,10 +173,10 @@ function wpsc_get_child_object_in_terms($parent_id, $terms, $taxonomies, $args =
173	foreach ( (array) $taxonomies as $taxonomy ) {
174	if ($current_version_number < 3.8) {
175	if ( ! taxonomy_exists($taxonomy) )
176	- return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
177	} else {
178	if ( !taxonomy_exists($taxonomy) )
179	- return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
180	}
181
182	}
	@@ -252,10 +252,10 @@ function wpsc_get_child_object_in_terms_var($parent_id, $terms, $taxonomies, $ar
252	foreach ( (array) $taxonomies as $taxonomy ) {
253	if ($current_version_number < 3.8) {
254	if ( ! taxonomy_exists($taxonomy) )
255	- return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
256	} else {
257	if ( !taxonomy_exists($taxonomy) )
258	- return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
259	}
260
261	}


173	foreach ( (array) $taxonomies as $taxonomy ) {
174	if ($current_version_number < 3.8) {
175	if ( ! taxonomy_exists($taxonomy) )
176	+ return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy', 'wpsc'));
177	} else {
178	if ( !taxonomy_exists($taxonomy) )
179	+ return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy', 'wpsc'));
180	}
181
182	}

252	foreach ( (array) $taxonomies as $taxonomy ) {
253	if ($current_version_number < 3.8) {
254	if ( ! taxonomy_exists($taxonomy) )
255	+ return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy', 'wpsc'));
256	} else {
257	if ( !taxonomy_exists($taxonomy) )
258	+ return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy', 'wpsc'));
259	}
260
261	}

wpsc-languages/wpsc.pot CHANGED Viewed

	@@ -4,7 +4,7 @@ msgid ""
4	msgstr ""
5	"Project-Id-Version: \n"
6	"Report-Msgid-Bugs-To: http://wordpress.org/tag/wp-e-commerce\n"
7	- "POT-Creation-Date: 2011-01-21 01:09:05+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
	@@ -12,53 +12,53 @@ msgstr ""
12	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13	"Language-Team: LANGUAGE <LL@li.org>\n"
14
15	- #: wpsc-theme/wpsc-list_view.php:81 wpsc-theme/wpsc-single_product.php:~~145~~
16	- #: wpsc-theme/wpsc-products_page.php:166 wpsc-includes/ajax.functions.php:~~410~~
17	msgid "Product in stock"
18	msgstr ""
19
20	- #: wpsc-theme/wpsc-list_view.php:83 wpsc-theme/wpsc-single_product.php:~~147~~
21	#: wpsc-theme/wpsc-products_page.php:168
22	msgid "Product not in stock"
23	msgstr ""
24
25	- #: wpsc-theme/wpsc-list_view.php:108 wpsc-theme/wpsc-single_product.php:~~135~~
26	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~483~~
27	#: wpsc-theme/wpsc-products_page.php:153
28	#: wpsc-theme/wpsc-shopping_cart_page.php:19
29	- #: wpsc-admin/admin-form-functions.php:~~407~~
30	#: wpsc-admin/display-sales-logs.php:136
31	- #: wpsc-includes/display.functions.php:45
32	msgid "Quantity"
33	msgstr ""
34
35	- #: wpsc-theme/wpsc-list_view.php:122 wpsc-theme/wpsc-single_product.php:~~191~~
36	#: wpsc-theme/wpsc-products_page.php:208
37	- #: wpsc-admin/includes/settings-pages/presentation.php:~~249~~
38	- #: wpsc-includes/product-template.php:~~681~~
39	- #: wpsc-includes/display.functions.php:~~175~~
40	msgid "Buy Now"
41	msgstr ""
42
43	- #: wpsc-theme/wpsc-list_view.php:124 wpsc-theme/wpsc-single_product.php:~~193~~
44	#: wpsc-theme/wpsc-grid_view.php:129 wpsc-theme/wpsc-products_page.php:210
45	#: wpsc-widgets/donations_widget.php:165
46	- #: wpsc-admin/includes/settings-pages/presentation.php:~~240~~
47	- #: wpsc-includes/display.functions.php:~~263~~
48	msgid "Add To Cart"
49	msgstr ""
50
51	- #: wpsc-theme/wpsc-list_view.php:128 wpsc-theme/wpsc-single_product.php:~~197~~
52	#: wpsc-theme/wpsc-grid_view.php:138 wpsc-theme/wpsc-products_page.php:204
53	msgid "Updating cart..."
54	msgstr ""
55
56	- #: wpsc-theme/wpsc-list_view.php:132 wpsc-theme/wpsc-single_product.php:~~201~~
57	msgid "This product has sold out."
58	msgstr ""
59
60	#: wpsc-theme/wpsc-list_view.php:145 wpsc-theme/wpsc-grid_view.php:158
61	- #: wpsc-theme/wpsc-products_page.php:~~232~~
62	msgid "There are no products in this group."
63	msgstr ""
64
	@@ -72,70 +72,70 @@ msgstr ""
72	msgid "Please visit our shop"
73	msgstr ""
74
75	- #: wpsc-theme/wpsc-single_product.php:95
76	msgid "Personalize Your Product"
77	msgstr ""
78
79	- #: wpsc-theme/wpsc-single_product.php:96
80	msgid ""
81	"Complete this form to include a personalized message with your purchase."
82	msgstr ""
83
84	- #: wpsc-theme/wpsc-single_product.php:~~104~~
85	msgid "Upload a File"
86	msgstr ""
87
88	- #: wpsc-theme/wpsc-single_product.php:~~105~~
89	msgid "Select a file from your computer to include with this purchase."
90	msgstr ""
91
92	- #: wpsc-theme/wpsc-single_product.php:~~111~~ wpsc-theme/wpsc-grid_view.php:109
93	#: wpsc-theme/wpsc-products_page.php:133
94	msgid "Product Options"
95	msgstr ""
96
97	- #: wpsc-theme/wpsc-single_product.php:~~150~~
98	#: wpsc-theme/wpsc-products_page.php:172 wpsc-widgets/donations_widget.php:164
99	msgid "Donation"
100	msgstr ""
101
102	- #: wpsc-theme/wpsc-single_product.php:~~154~~
103	- #: wpsc-theme/wpsc-~~single_product~~.php:~~156~~
104	- #: ~~wpsc-theme/functions/wpsc-user_log_functions.php:487~~
105	- #: ~~wpsc-theme/wpsc-grid_view.php:89 wpsc-theme/wpsc-grid_view.php:91~~
106	- ~~#: wpsc-theme/wpsc-products_page.php:179 wpsc-theme/wpsc-user-log.php:104~~
107	- #: wpsc-theme/wpsc-~~cart_widget~~.php:14



108	#: wpsc-theme/wpsc-shopping_cart_page.php:20
109	- #: wpsc-admin/includes/settings-pages/presentation.php:~~590~~
110	- #: wpsc-admin/includes/~~display~~-~~items-functions~~.php:~~119~~
111	- #: wpsc-admin/includes/display-items-functions.php:~~144~~
112	- #: wpsc-admin/includes/display-items-functions.php:~~167~~
113	- #: wpsc-admin/~~display-items~~.~~page.~~php:48 wpsc-admin/display-items.page.php:61
114	- #: wpsc-admin/display-items.page.php:76
115	- #: wpsc-admin/admin-form-functions.php:~~412~~
116	#: wpsc-admin/display-sales-logs.php:137
117	msgid "Price"
118	msgstr ""
119
120	- #: wpsc-theme/wpsc-single_product.php:~~158~~
121	#: wpsc-theme/wpsc-products_page.php:181
122	msgid "You save"
123	msgstr ""
124
125	- #: wpsc-theme/wpsc-single_product.php:~~165~~
126	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~495~~
127	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:209
128	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:212
129	#: wpsc-theme/wpsc-grid_view.php:93 wpsc-theme/wpsc-products_page.php:190
130	- #: wpsc-theme/wpsc-cart_widget.php:38 wpsc-admin/admin~~-form-functions~~.php:~~414~~

131	#: wpsc-admin/display-sales-logs.php:138 wpsc-admin/display-sales-logs.php:228
132	- #: wpsc-admin/display-options-settings.page.php:113
133	- #: wpsc-admin/ajax-and-init.php:849 wpsc-admin/ajax-and-init.php:852
134	msgid "Shipping"
135	msgstr ""
136
137	#: wpsc-theme/functions/wpsc-user_log_functions.php:65
138	- #: wpsc-core/wpsc-installer.php:~~708~~ wpsc-core/wpsc-installer.php:~~717~~
139	msgid "First Name"
140	msgstr ""
141
	@@ -144,7 +144,7 @@ msgid "Please enter a valid name"
144	msgstr ""
145
146	#: wpsc-theme/functions/wpsc-user_log_functions.php:69
147	- #: wpsc-core/wpsc-installer.php:~~709~~ wpsc-core/wpsc-installer.php:~~718~~
148	msgid "Last Name"
149	msgstr ""
150
	@@ -153,8 +153,8 @@ msgid "Please enter a valid surname"
153	msgstr ""
154
155	#: wpsc-theme/functions/wpsc-user_log_functions.php:73
156	- #: wpsc-core/wpsc-installer.php:~~715~~ wpsc-admin/admin.php:~~316~~
157	- #: wpsc-admin/admin-form-functions.php:~~381~~
158	msgid "Email"
159	msgstr ""
160
	@@ -175,7 +175,7 @@ msgid "Please enter a valid address"
175	msgstr ""
176
177	#: wpsc-theme/functions/wpsc-user_log_functions.php:82
178	- #: wpsc-core/wpsc-installer.php:~~711~~ wpsc-core/wpsc-installer.php:~~720~~
179	msgid "City"
180	msgstr ""
181
	@@ -184,7 +184,7 @@ msgid "Please enter your town or city."
184	msgstr ""
185
186	#: wpsc-theme/functions/wpsc-user_log_functions.php:86
187	- #: wpsc-core/wpsc-installer.php:~~728~~ wpsc-admin/admin-form-functions.php:~~380~~
188	msgid "Phone"
189	msgstr ""
190
	@@ -193,8 +193,8 @@ msgid "Please enter a valid phone number"
193	msgstr ""
194
195	#: wpsc-theme/functions/wpsc-user_log_functions.php:90
196	- #: wpsc-core/wpsc-installer.php:~~713~~ wpsc-core/wpsc-installer.php:~~722~~
197	- #: wpsc-admin/admin.php:~~317~~
198	msgid "Country"
199	msgstr ""
200
	@@ -203,9 +203,6 @@ msgid "Please select your country from the list."
203	msgstr ""
204
205	#: wpsc-theme/functions/wpsc-user_log_functions.php:95
206	- #: wpsc-includes/checkout.class.php:762 wpsc-includes/checkout.class.php:772
207	- #: wpsc-includes/checkout.class.php:780 wpsc-includes/checkout.class.php:790
208	- #: wpsc-includes/checkout.class.php:854
209	msgid "Please enter a valid"
210	msgstr ""
211
	@@ -213,180 +210,170 @@ msgstr ""
213	msgid "Thanks, your changes have been saved."
214	msgstr ""
215
216	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~383~~

217	msgid "Details"
218	msgstr ""
219
220	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~432~~
221	msgid "Order Status"
222	msgstr ""
223
224	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~452~~


225	#: wpsc-admin/display-sales-logs.php:153
226	- msgid "Shipping ~~Details~~"
227	msgstr ""
228
229	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~469~~
230	msgid "Order Details"
231	msgstr ""
232
233	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~479~~
234	- #: wpsc-admin/~~display~~-~~groups~~.~~page.~~php:35
235	- #: wpsc-admin/~~display~~-~~groups~~.~~page.~~php:~~301~~
236	- #: wpsc-admin/includes/~~settings~~-~~pages/presentation~~.php:~~588~~
237	- #: wpsc-admin/includes/display-items-functions.php:~~591~~
238	- #: wpsc-admin/includes/display-items~~-functions~~.php:~~602~~
239	- #: wpsc-admin/display-items.page.php:~~45 wpsc-admin/display-items.page.php:~~73
240	- #: wpsc-admin/~~display~~-~~upgrades~~.~~page.~~php:88
241	- #: wpsc-admin/admin-form-functions.php:~~378~~
242	- #: wpsc-admin/admin-form-functions.php:409
243	#: wpsc-admin/display-sales-logs.php:134
244	- #: wpsc-~~admin~~/~~display-variations~~.~~page~~.php:13
245	- #: wpsc-admin/display-variations.page.php:167
246	- #: wpsc-taxes/controllers/taxes_controller.class.php:484
247	msgid "Name"
248	msgstr ""
249
250	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~491~~
251	msgid "GST"
252	msgstr ""
253
254	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~499~~
255	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:253
256	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:266
257	#: wpsc-theme/wpsc-cart_widget.php:52
258	#: wpsc-theme/wpsc-shopping_cart_page.php:21
259	#: wpsc-admin/display-sales-logs.php:140 wpsc-admin/display-sales-logs.php:233
260	- #: wpsc-admin/ajax-and-init.php:880 wpsc-admin/ajax-and-init.php:893
261	msgid "Total"
262	msgstr ""
263
264	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~572~~
265	- #: wpsc-theme/~~functions/~~wpsc-~~transaction_results_functions~~.php:~~252~~
266	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:265
267	- #: wpsc-theme/wpsc-shopping_cart_page.php:439 wpsc-admin/ajax-and-init.php:879
268	- #: wpsc-admin/ajax-and-init.php:892
269	msgid "Total Shipping"
270	msgstr ""
271
272	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~573~~
273	msgid "Final Total"
274	msgstr ""
275
276	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~588~~
277	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~319~~
278	msgid "Customer Details"
279	msgstr ""
280
281	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~643~~
282	#: wpsc-theme/wpsc-user-log.php:108
283	msgid "Payment Method"
284	msgstr ""
285
286	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~644~~
287	msgid "Purchase #"
288	msgstr ""
289
290	- #: wpsc-theme/functions/wpsc-user_log_functions.php:~~646~~
291	msgid "Transaction Id"
292	msgstr ""
293
294	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:94
295	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:95
296	- msgid ""
297	- "All prices include tax and postage and packaging where applicable. You "
298	- "ordered these items:%product_list%%total_tax%%total_shipping%%total_price%"
299	- msgstr ""
300	-
301	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:98
302	msgid "The Transaction was successful"
303	msgstr ""
304
305	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~111~~
306	- ~~msgid~~ ~~"New pending order"~~

307	msgstr ""
308
309	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~111~~
310	- msgid "~~There~~ is a ~~new order awaiting processing:~~"
311	msgstr ""
312
313	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~113~~
314	- msgid ""
315	- "We're Sorry, your order has not been accepted, the most likely reason is "
316	- "that you have insufficient funds."
317	msgstr ""
318
319	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~117~~
320	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~307~~
321	- #: wpsc-~~theme~~/~~functions/~~wpsc-~~transaction_results_functions~~.php:~~308~~
322	- #: ~~wpsc-admin/ajax-and-init.php:927~~
323	- msgid ""
324	- "Thank you, your purchase is pending, you will be sent an email once the "
325	- "order clears."
326	msgstr ""
327
328	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~197~~
329	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~198~~
330	- #: ~~wpsc-admin/ajax-and-init.php~~:~~834~~ ~~wpsc-admin/ajax-and-init.php:835~~
331	- msgid "Click to download"
332	msgstr ""
333
334	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~218~~
335	- #: wpsc-~~admin~~/~~display-sales-logs.php:145~~ wpsc-~~admin/ajax-and-init~~.php:~~857~~
336	- #: ~~wpsc-includes/checkout.class.php~~:~~143~~
337	- msgid "Tax Included"
338	msgstr ""
339
340	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~244~~
341	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~257~~
342	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~450~~
343	#: wpsc-admin/display-coupons.php:153 wpsc-admin/display-coupons.php:297
344	#: wpsc-admin/admin-form-functions.php:14
345	- #: wpsc-admin/display-sales-logs.php:214 ~~wpsc-admin/ajax-and-init.php:877~~
346	- #: wpsc-admin/ajax-and-init.php:883
347	msgid "Discount"
348	msgstr ""
349
350	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~263~~
351	- #: wpsc-~~admin~~/~~ajax~~-~~and-init~~.php:~~889~~
352	msgid "Total Tax"
353	msgstr ""
354
355	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~269~~
356	- #: ~~wpsc-theme/functions/wpsc-transaction_results_functions.php:270~~
357	- #: ~~wpsc-admin/ajax-and-init.php:895 wpsc-admin/ajax-and-init.php:896~~



358	msgid "Your Transaction ID"
359	msgstr ""
360
361	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~271~~
362	- #: wpsc-admin/ajax-and-init.php:897
363	msgid "Transaction ID"
364	msgstr ""
365
366	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~310~~
367	- #: wpsc-~~admin~~/~~ajax~~-~~and-init~~.php:~~928~~






368	msgid "Order Pending: Payment Required"
369	msgstr ""
370
371	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~312~~
372	#: wpsc-admin/includes/settings-pages/admin.php:123
373	- #: wpsc-admin/ajax-and-init.php:931
374	msgid "Purchase Receipt"
375	msgstr ""
376
377	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~334~~

378	msgid "Billing State"
379	msgstr ""
380
381	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~343~~
382	msgid "Delivery State"
383	msgstr ""
384
385	- #: wpsc-theme/functions/wpsc-transaction_results_functions.php:~~356~~
386	msgid "Purchase Report"
387	msgstr ""
388
389	- #: wpsc-theme/wpsc-grid_view.php:79 wpsc-theme/wpsc-products_page.php:~~226~~

390	msgid "Sale"
391	msgstr ""
392
	@@ -398,8 +385,10 @@ msgstr ""
398	msgid "More Details"
399	msgstr ""
400
401	- #: wpsc-theme/wpsc-products_page.php:~~177~~
402	- ~~msgid~~ ~~"Old~~ ~~price"~~


403	msgstr ""
404
405	#: wpsc-theme/wpsc-user-log.php:16
	@@ -427,7 +416,7 @@ msgid "Downloads Left"
427	msgstr ""
428
429	#: wpsc-theme/wpsc-user-log.php:52 wpsc-theme/wpsc-user-log.php:103
430	- #: wpsc-admin/display-items.page.php:54
431	msgid "Date"
432	msgstr ""
433
	@@ -435,7 +424,7 @@ msgstr ""
435	msgid "You have not purchased any downloadable products yet."
436	msgstr ""
437
438	- #: wpsc-theme/wpsc-user-log.php:102
439	msgid "Status"
440	msgstr ""
441
	@@ -484,11 +473,14 @@ msgstr[1] ""
484	msgid "Postage & Tax "
485	msgstr ""
486
487	- #: wpsc-theme/wpsc-cart_widget.php:64 wpsc-core/wpsc-installer.php:~~173~~
488	- #: wpsc-admin/display-options-settings.page.php:115
489	msgid "Checkout"
490	msgstr ""
491




492	#: wpsc-theme/wpsc-cart_widget.php:67
493	msgid "Clear cart"
494	msgstr ""
	@@ -511,10 +503,6 @@ msgstr ""
511
512	#: wpsc-theme/wpsc-shopping_cart_page.php:60
513	#: wpsc-theme/wpsc-shopping_cart_page.php:92
514	- #: wpsc-admin/includes/variations_table_class.php:714
515	- #: wpsc-admin/includes/variations_table_class.php:716
516	- #: wpsc-admin/includes/variations_table_class.php:719
517	- #: wpsc-admin/includes/products.php:549 wpsc-admin/includes/products.php:551
518	msgid "Update"
519	msgstr ""
520
	@@ -556,269 +544,159 @@ msgstr ""
556	msgid " - Choose a Shipping Rate"
557	msgstr ""
558
559	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~220~~
560	msgid "You must sign in or register with us to continue with your purchase"
561	msgstr ""
562
563	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~224~~
564	msgid "Sign in"
565	msgstr ""
566
567	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~230~~
568	msgid "If you have bought from us before please sign in here to purchase"
569	msgstr ""
570
571	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~249~~
572	msgid "Join up now"
573	msgstr ""
574
575	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~251~~
576	msgid "Username"
577	msgstr ""
578
579	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~254~~
580	msgid "Password"
581	msgstr ""
582
583	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~257~~ wpsc-includes/share-this.php:248
584	#: wpsc-includes/share-this.php:617
585	msgid "E-mail"
586	msgstr ""
587
588	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~260~~
589	msgid ""
590	"Signing up is free and easy! please fill out your details your registration "
591	"will happen automatically as you checkout. Don't forget to use your details "
592	"to login with next time!"
593	msgstr ""
594
595	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~299~~
596	- msgid "~~Shipping~~ ~~address the same~~ as ~~Billing~~ address?"




597	msgstr ""
598
599	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~341~~
600	msgid "Enter your email address"
601	msgstr ""
602
603	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~371~~
604	msgid "How did you find us"
605	msgstr ""
606
607	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~374~~
608	msgid "Word of mouth"
609	msgstr ""
610
611	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~375~~
612	msgid "Advertising"
613	msgstr ""
614
615	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~376~~
616	msgid "Internet"
617	msgstr ""
618
619	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~377~~
620	msgid "Existing Customer"
621	msgstr ""
622
623	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~388~~
624	msgid "Payment Type"
625	msgstr ""
626
627	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~421~~
628	- msgid "~~I agree to The~~ "
629	- ~~msgstr~~ ""
630	-
631	- #: wpsc-theme/wpsc-shopping_cart_page.php:423
632	- #: wpsc-admin/includes/settings-pages/admin.php:102
633	- msgid "Terms and Conditions"
634	msgstr ""
635
636	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~433~~
637	msgid "Review and purchase"
638	msgstr ""
639
640	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~462~~ wpsc-shipping/tablerate.php:50
641	msgid "Total Price"
642	msgstr ""
643
644	- #: wpsc-theme/wpsc-shopping_cart_page.php:~~477~~
645	msgid "Purchase"
646	msgstr ""
647
648	- #: wpsc-core/wpsc-installer.php:~~56 wpsc-widgets/category_widget.php:142~~
649	- #: wpsc-widgets/latest_product_widget.php:98
650	- #: wpsc-widgets/specials_widget.php:106
651	- #: wpsc-admin/includes/settings-pages/presentation.php:1042
652	- msgid "Show Thumbnails"
653	- msgstr ""
654	-
655	- #: wpsc-core/wpsc-installer.php:57
656	- msgid "Use Thickbox Effect for product images"
657	- msgstr ""
658	-
659	- #: wpsc-core/wpsc-installer.php:59
660	- msgid "The location of the product list"
661	- msgstr ""
662	-
663	- #: wpsc-core/wpsc-installer.php:60
664	- msgid "The location of the shopping cart"
665	- msgstr ""
666	-
667	- #: wpsc-core/wpsc-installer.php:61
668	- msgid "The location of the checkout page"
669	- msgstr ""
670	-
671	- #: wpsc-core/wpsc-installer.php:62
672	- msgid "The location of the transaction detail page"
673	- msgstr ""
674	-
675	- #: wpsc-core/wpsc-installer.php:63
676	- msgid "The payment gateway to use"
677	- msgstr ""
678	-
679	- #: wpsc-core/wpsc-installer.php:78 wpsc-core/wpsc-installer.php:80
680	- #: wpsc-core/wpsc-installer.php:83 wpsc-core/wpsc-installer.php:85
681	- #: wpsc-admin/includes/settings-pages/presentation.php:775
682	- msgid "Cart Location"
683	- msgstr ""
684	-
685	- #: wpsc-core/wpsc-installer.php:87
686	- #: wpsc-admin/includes/display-items-functions.php:135
687	- #: wpsc-admin/includes/display-items-functions.php:155
688	- msgid "Currency type"
689	- msgstr ""
690	-
691	- #: wpsc-core/wpsc-installer.php:88
692	- msgid "Currency sign location"
693	- msgstr ""
694	-
695	- #: wpsc-core/wpsc-installer.php:90
696	- msgid "the GST rate"
697	- msgstr ""
698	-
699	- #: wpsc-core/wpsc-installer.php:92
700	- msgid "the download limit"
701	- msgstr ""
702	-
703	- #: wpsc-core/wpsc-installer.php:94
704	- msgid "Display or hide postage and packaging"
705	- msgstr ""
706	-
707	- #: wpsc-core/wpsc-installer.php:96
708	- msgid "Display or hide specials on the sidebar"
709	- msgstr ""
710	-
711	- #: wpsc-core/wpsc-installer.php:99
712	- msgid "Default postage and packaging"
713	- msgstr ""
714	-
715	- #: wpsc-core/wpsc-installer.php:101
716	- msgid "Email address that purchase log is sent to"
717	- msgstr ""
718	-
719	- #: wpsc-core/wpsc-installer.php:102
720	- msgid "Email address that purchase reports are sent from"
721	- msgstr ""
722	-
723	- #: wpsc-core/wpsc-installer.php:103
724	- msgid "Checkout terms and conditions"
725	- msgstr ""
726	-
727	- #: wpsc-core/wpsc-installer.php:105
728	- msgid "Google Merchant Key"
729	- msgstr ""
730	-
731	- #: wpsc-core/wpsc-installer.php:106
732	- msgid "Google Merchant ID"
733	- msgstr ""
734	-
735	- #: wpsc-core/wpsc-installer.php:108
736	- msgid "Default Brand"
737	- msgstr ""
738	-
739	- #: wpsc-core/wpsc-installer.php:109
740	- msgid "Select what product group you want to display on the products page"
741	- msgstr ""
742	-
743	- #: wpsc-core/wpsc-installer.php:121 wpsc-core/wpsc-installer.php:126
744	- msgid "paypal business"
745	- msgstr ""
746	-
747	- #: wpsc-core/wpsc-installer.php:122 wpsc-core/wpsc-installer.php:123
748	- msgid "paypal url"
749	- msgstr ""
750	-
751	- #: wpsc-core/wpsc-installer.php:130
752	- #: wpsc-admin/includes/settings-pages/presentation.php:282
753	- msgid "Show Product Ratings"
754	- msgstr ""
755	-
756	- #: wpsc-core/wpsc-installer.php:131
757	msgid ""
758	"Thank you for purchasing with %shop_name%, any items to be shipped will be "
759	"processed as soon as possible, any items that can be downloaded can be "
760	"downloaded using the links on this page.All prices include tax and postage "
761	- "and packaging where applicable~~.\\r\\~~n ~~You ordered these items:\\r\\n%~~"
762	- "~~product_list%%total_shipping%%total_price%~~"

763	msgstr ""
764
765	- #: wpsc-core/wpsc-installer.php:~~132~~ wpsc-updates/updating_tasks.php:391
766	#: wpsc-updates/updating_tasks.php:404
767	msgid "%product_list%%total_shipping%%total_price%"
768	msgstr ""
769
770	- #: wpsc-core/wpsc-installer.php:~~167~~
771	msgid "Products Page"
772	msgstr ""
773
774	- #: wpsc-core/wpsc-installer.php:~~179~~
775	msgid "Transaction Results"
776	msgstr ""
777
778	- #: wpsc-core/wpsc-installer.php:~~185~~
779	msgid "Your Account"
780	msgstr ""
781
782	- #: wpsc-core/wpsc-installer.php:~~256~~
783	msgid "Product Category"
784	msgstr ""
785
786	- #: wpsc-core/wpsc-installer.php:~~263~~
787	msgid "This is a description"
788	msgstr ""
789
790	- #: wpsc-core/wpsc-installer.php:~~707~~
791	msgid "Your billing/contact details"
792	msgstr ""
793
794	- #: wpsc-core/wpsc-installer.php:~~710~~ wpsc-core/wpsc-installer.php:~~719~~
795	- #: wpsc-admin/admin-form-functions.php:~~379~~
796	msgid "Address"
797	msgstr ""
798
799	- #: wpsc-core/wpsc-installer.php:~~712~~ wpsc-core/wpsc-installer.php:~~721~~

800	#: wpsc-admin/admin-form-functions.php:328
801	- #: wpsc-admin/admin-form-functions.php:336
802	msgid "State"
803	msgstr ""
804
805	- #: wpsc-core/wpsc-installer.php:~~714~~ wpsc-core/wpsc-installer.php:~~723~~
806	msgid "Postal Code"
807	msgstr ""
808
809	- #: wpsc-core/wpsc-installer.php:716
810	- msgid "Shipping details"
811	- msgstr ""
812	-
813	#: wpsc-core/js/tinymce3/window.php:9
814	msgid "You don't have permission to be doing that!"
815	msgstr ""
816
817	- #: wpsc-core/js/tinymce3/window.php:43
818	msgid "Category"
819	msgstr ""
820
821	- #: wpsc-core/js/tinymce3/window.php:44 wpsc-core/wpsc-functions.php:~~252~~
822	msgid "Products"
823	msgstr ""
824
	@@ -906,6 +784,10 @@ msgid ""
906	"things like images "
907	msgstr ""
908




909	#: wpsc-core/js/tinymce3/window.php:149
910	msgid ""
911	" You don't have the Members and Capabilities plugin installed, to start "
	@@ -957,9 +839,7 @@ msgstr ""
957	msgid "This will add the selected product to your page."
958	msgstr ""
959
960	- #: wpsc-core/js/tinymce3/window.php:203
961	- #: wpsc-admin/includes/variations_table_class.php:711
962	- #: wpsc-admin/includes/products.php:546
963	msgid "Cancel"
964	msgstr ""
965
	@@ -967,157 +847,198 @@ msgstr ""
967	msgid "Insert"
968	msgstr ""
969
970	- #: wpsc-core/wpsc-functions.php:~~100~~
971	msgid "Incomplete Sale"
972	msgstr ""
973
974	- #: wpsc-core/wpsc-functions.php:~~105~~
975	msgid "Order Received"
976	msgstr ""
977
978	- #: wpsc-core/wpsc-functions.php:~~110~~
979	msgid "Accepted Payment"
980	msgstr ""
981
982	- #: wpsc-core/wpsc-functions.php:~~116~~
983	msgid "Job Dispatched"
984	msgstr ""
985
986	- #: wpsc-core/wpsc-functions.php:~~122~~
987	msgid "Closed Order"
988	msgstr ""
989
990	- #: wpsc-core/wpsc-functions.php:~~128~~
991	msgid "Payment Declined"
992	msgstr ""
993
994	- #: wpsc-core/wpsc-functions.php:~~214~~
995	msgid "Please Note"
996	msgstr ""
997
998	- #: wpsc-core/wpsc-functions.php:~~215~~
999	msgid ""
1000	"Before upgrading you should check the <a %s>upgrade information</a> and "
1001	"changelog as you may need to make updates to your template files."
1002	msgstr ""
1003
1004	- #: wpsc-core/wpsc-functions.php:~~241~~
1005	- msgctxt "~~wpsc-product~~"
1006	msgid "Products"
1007	msgstr ""
1008
1009	- #: wpsc-core/wpsc-functions.php:~~242~~
1010	- msgctxt "~~wpsc-product~~"
1011	msgid "Product"
1012	msgstr ""
1013
1014	- #: wpsc-core/wpsc-functions.php:~~243~~
1015	- msgctxt "~~wpsc-~~product"
1016	msgid "Add New"
1017	msgstr ""
1018
1019	- #: wpsc-core/wpsc-functions.php:~~244 wpsc-admin/admin-form-functions.php:268~~
1020	- #: wpsc-admin/admin-form-functions.php:276
1021	msgid "Add New Product"
1022	msgstr ""
1023
1024	- #: wpsc-core/wpsc-functions.php:~~245~~
1025	msgid "Edit Product"
1026	msgstr ""
1027
1028	- #: wpsc-core/wpsc-functions.php:~~246~~
1029	msgid "New Product"
1030	msgstr ""
1031
1032	- #: wpsc-core/wpsc-functions.php:~~247~~
1033	msgid "View Product"
1034	msgstr ""
1035
1036	- #: wpsc-core/wpsc-functions.php:~~248~~
1037	msgid "Search Products"
1038	msgstr ""
1039
1040	- #: wpsc-core/wpsc-functions.php:~~249~~
1041	msgid "No products found"
1042	msgstr ""
1043
1044	- #: wpsc-core/wpsc-functions.php:~~250~~
1045	msgid "No products found in Trash"
1046	msgstr ""
1047
1048	- #: wpsc-core/wpsc-functions.php:~~281~~
1049	msgctxt "taxonomy general name"
1050	msgid "Product Tags"
1051	msgstr ""
1052
1053	- #: wpsc-core/wpsc-functions.php:~~282~~
1054	msgctxt "taxonomy singular name"
1055	msgid "Product Tag"
1056	msgstr ""
1057
1058	- #: wpsc-core/wpsc-functions.php:~~283~~
1059	msgid "Product Search Tags"
1060	msgstr ""
1061
1062	- #: wpsc-core/wpsc-functions.php:~~284~~
1063	msgid "All Product Tags"
1064	msgstr ""
1065
1066	- #: wpsc-core/wpsc-functions.php:~~285~~
1067	msgid "Edit Tag"
1068	msgstr ""
1069
1070	- #: wpsc-core/wpsc-functions.php:~~286~~
1071	msgid "Update Tag"
1072	msgstr ""
1073
1074	- #: wpsc-core/wpsc-functions.php:~~287~~
1075	msgid "Add new Product Tag"
1076	msgstr ""
1077
1078	- #: wpsc-core/wpsc-functions.php:~~288~~
1079	msgid "New Product Tag Name"
1080	msgstr ""
1081
1082	- #: wpsc-core/wpsc-functions.php:~~308~~










































1083	msgctxt "taxonomy general name"
1084	msgid "Variations"
1085	msgstr ""
1086
1087	- #: wpsc-core/wpsc-functions.php:~~309~~
1088	msgctxt "taxonomy singular name"
1089	msgid "Variation"
1090	msgstr ""
1091
1092	- #: wpsc-core/wpsc-functions.php:~~310~~
1093	msgid "Search Variations"
1094	msgstr ""
1095
1096	- #: wpsc-core/wpsc-functions.php:~~311~~
1097	msgid "All Variations"
1098	msgstr ""
1099
1100	- #: wpsc-core/wpsc-functions.php:~~312~~
1101	msgid "Parent Variation"
1102	msgstr ""
1103
1104	- #: wpsc-core/wpsc-functions.php:~~313~~
1105	msgid "Parent Variations:"
1106	msgstr ""
1107
1108	- #: wpsc-core/wpsc-functions.php:~~314~~
1109	msgid "Edit Variation"
1110	msgstr ""
1111
1112	- #: wpsc-core/wpsc-functions.php:~~315~~
1113	msgid "Update Variation"
1114	msgstr ""
1115
1116	- #: wpsc-core/wpsc-functions.php:~~316~~
1117	- msgid "Add New Variation"
1118	msgstr ""
1119
1120	- #: wpsc-core/wpsc-functions.php:~~317~~
1121	msgid "New Variation Name"
1122	msgstr ""
1123
	@@ -1159,35 +1080,68 @@ msgstr ""
1159	msgid "Test Mode Enabled:"
1160	msgstr ""
1161
































1162	#: wpsc-merchants/chronopay.php:436
1163	- #: wpsc-merchants/paypal-standard.merchant.php:~~490~~
1164	- #: wpsc-merchants/paypal-standard.merchant.php:~~498~~
1165	- #: wpsc-merchants/paypal-standard.merchant.php:~~514~~
1166	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~508~~
1167	- #: wpsc-admin/includes/~~settings~~-~~pages/presentation~~.php:~~271~~
1168	- #: wpsc-admin/includes/settings-pages/presentation.php:~~298~~
1169	- #: wpsc-admin/includes/settings-pages/presentation.php:~~316~~
1170	- #: wpsc-admin/includes/settings-pages/presentation.php:~~339~~
1171	- #: wpsc-admin/includes/settings-pages/presentation.php:~~362~~
1172	- #: wpsc-admin/includes/settings-pages/presentation.php:~~385~~
1173	- #: wpsc-admin/includes/settings-pages/presentation.php:~~408~~
1174	- #: wpsc-admin/includes/settings-pages/presentation.php:~~548~~
1175	- #: wpsc-admin/includes/settings-pages/presentation.php:~~616~~
1176	- #: wpsc-admin/includes/settings-pages/presentation.php:~~665~~
1177	- #: wpsc-admin/includes/settings-pages/presentation.php:~~709~~
1178	- #: wpsc-admin/includes/settings-pages/presentation.php:~~744~~
1179	- #: wpsc-admin/includes/settings-pages/presentation.php:~~766~~
1180	- #: wpsc-admin/includes/settings-pages/presentation.php:~~874~~
1181	- #: wpsc-admin/includes/settings-pages/presentation.php:~~901~~
1182	- #: wpsc-admin/includes/settings-pages/presentation.php:~~925~~
1183	- #: wpsc-admin/includes/settings-pages/presentation.php:~~951~~
1184	- #: wpsc-admin/includes/settings-pages/presentation.php:~~976~~
1185	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1032~~
1186	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1058~~
1187	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1079~~
1188	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1123~~
1189	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1168~~
1190	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1221~~

1191	#: wpsc-admin/includes/settings-pages/admin.php:38
1192	#: wpsc-admin/includes/settings-pages/admin.php:64
1193	#: wpsc-admin/includes/settings-pages/checkout.php:51
	@@ -1196,38 +1150,40 @@ msgstr ""
1196	#: wpsc-admin/includes/settings-pages/shipping.php:66
1197	#: wpsc-admin/includes/settings-pages/shipping.php:108
1198	#: wpsc-admin/includes/settings-pages/shipping.php:139

1199	msgid "Yes"
1200	msgstr ""
1201
1202	#: wpsc-merchants/chronopay.php:437
1203	- #: wpsc-merchants/paypal-standard.merchant.php:~~491~~
1204	- #: wpsc-merchants/paypal-standard.merchant.php:~~499~~
1205	- #: wpsc-merchants/paypal-standard.merchant.php:~~515~~
1206	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~509~~
1207	- #: wpsc-admin/includes/~~settings~~-~~pages/presentation~~.php:~~272~~
1208	- #: wpsc-admin/includes/settings-pages/presentation.php:~~299~~
1209	- #: wpsc-admin/includes/settings-pages/presentation.php:~~317~~
1210	- #: wpsc-admin/includes/settings-pages/presentation.php:~~340~~
1211	- #: wpsc-admin/includes/settings-pages/presentation.php:~~363~~
1212	- #: wpsc-admin/includes/settings-pages/presentation.php:~~387~~
1213	- #: wpsc-admin/includes/settings-pages/presentation.php:~~411~~
1214	- #: wpsc-admin/includes/settings-pages/presentation.php:~~550~~
1215	- #: wpsc-admin/includes/settings-pages/presentation.php:~~617~~
1216	- #: wpsc-admin/includes/settings-pages/presentation.php:~~666~~
1217	- #: wpsc-admin/includes/settings-pages/presentation.php:~~710~~
1218	- #: wpsc-admin/includes/settings-pages/presentation.php:~~745~~
1219	- #: wpsc-admin/includes/settings-pages/presentation.php:~~767~~
1220	- #: wpsc-admin/includes/settings-pages/presentation.php:~~875~~
1221	- #: wpsc-admin/includes/settings-pages/presentation.php:~~902~~
1222	- #: wpsc-admin/includes/settings-pages/presentation.php:~~926~~
1223	- #: wpsc-admin/includes/settings-pages/presentation.php:~~952~~
1224	- #: wpsc-admin/includes/settings-pages/presentation.php:~~977~~
1225	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1033~~
1226	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1059~~
1227	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1080~~
1228	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1124~~
1229	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1169~~
1230	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1222~~

1231	#: wpsc-admin/includes/settings-pages/admin.php:39
1232	#: wpsc-admin/includes/settings-pages/admin.php:65
1233	#: wpsc-admin/includes/settings-pages/checkout.php:52
	@@ -1236,17 +1192,19 @@ msgstr ""
1236	#: wpsc-admin/includes/settings-pages/shipping.php:67
1237	#: wpsc-admin/includes/settings-pages/shipping.php:109
1238	#: wpsc-admin/includes/settings-pages/shipping.php:140

1239	msgid "No"
1240	msgstr ""
1241
1242	#: wpsc-merchants/chronopay.php:449
1243	- #: wpsc-merchants/paypal-standard.merchant.php:~~573~~
1244	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1257~~
1245	#: wpsc-admin/includes/settings-pages/admin.php:166
1246	#: wpsc-admin/includes/settings-pages/marketing.php:82
1247	- #: wpsc-admin/includes/settings-pages/general.php:~~161~~
1248	- #: wpsc-admin/includes/settings-pages/shipping.php:~~227~~
1249	- #: wpsc-admin/includes/settings-pages/shipping.php:~~254~~

1250	#: wpsc-admin/includes/settings-pages/gateway.php:113
1251	#: wpsc-admin/includes/settings-pages/gateway.php:148
1252	msgid "Update »"
	@@ -1262,16 +1220,16 @@ msgstr ""
1262	msgid "Save Changes"
1263	msgstr ""
1264
1265	- #: wpsc-merchants/paypal-standard.merchant.php:~~150~~
1266	msgid "Your Subscription"
1267	msgstr ""
1268
1269	- #: wpsc-merchants/paypal-standard.merchant.php:~~538~~
1270	- #: wpsc-merchants/paypal-express.merchant.php:~~291~~
1271	msgid "Currency Converter"
1272	msgstr ""
1273
1274	- #: wpsc-merchants/paypal-standard.merchant.php:~~541~~
1275	msgid ""
1276	"Your website uses <strong>%s</strong>. This currency is not supported by "
1277	"PayPal, please select a currency using the drop down menu below. Buyers on "
	@@ -1279,7 +1237,39 @@ msgid ""
1279	"order through to Paypal using the currency you choose below."
1280	msgstr ""
1281
1282	- #: wpsc-merchants/paypal-express.merchant.php:~~293~~
































1283	msgid ""
1284	"Your website is using a currency not accepted by PayPal, select an accepted "
1285	"currency using the drop down menu bellow. Buyers on your site will still pay "
	@@ -1287,7 +1277,56 @@ msgid ""
1287	"order through to PayPal using the currency you choose below."
1288	msgstr ""
1289
1290	- #: wpsc-merchants/paypal-express.merchant.php:~~661~~

















































1291	msgid "Confirm Payment"
1292	msgstr ""
1293
	@@ -1296,8 +1335,6 @@ msgid "Product Grouping Widget"
1296	msgstr ""
1297
1298	#: wpsc-widgets/category_widget.php:19 wpsc-widgets/category_widget.php:34
1299	- #: wpsc-admin/display-groups.page.php:69
1300	- #: wpsc-admin/display-groups.page.php:167
1301	msgid "Product Categories"
1302	msgstr ""
1303
	@@ -1319,10 +1356,17 @@ msgid "(leave all unchecked if you want to display all)"
1319	msgstr ""
1320
1321	#: wpsc-widgets/category_widget.php:140
1322	- #: wpsc-admin/includes/settings-pages/presentation.php:~~959~~
1323	msgid "Use Category Grid View"
1324	msgstr ""
1325







1326	#: wpsc-widgets/category_widget.php:148
1327	msgid " Show N/A when No Image Available"
1328	msgstr ""
	@@ -1440,161 +1484,185 @@ msgstr ""
1440	msgid "Fix Product Group Permalinks"
1441	msgstr ""
1442
1443	- #: wpsc-admin/~~display-groups~~.~~page.~~php:34
1444	- msgid "~~Image~~"
1445	- msgstr ""
1446	-
1447	- #: wpsc-admin/display-groups.page.php:42
1448	- msgid "Are you sure you want to delete this category?"
1449	msgstr ""
1450
1451	- #: wpsc-admin/~~display-groups.page.php:72 wpsc-admin~~/~~display-coupons~~.php:~~141~~
1452	- #: ~~wpsc-includes/purchaselogs.class.php:21~~
1453	- msgid "Add New"
1454	msgstr ""
1455
1456	- #: wpsc-admin/~~display-groups~~.~~page.~~php:81
1457	- msgid "~~Thanks,~~ ~~the~~ ~~category has been deleted~~"
1458	msgstr ""
1459
1460	- #: wpsc-admin/~~display-groups~~.~~page.~~php:89
1461	- msgid "~~Please~~ ~~give a category name~~"
1462	msgstr ""
1463
1464	- #: wpsc-admin/~~display-groups~~.~~page.~~php:91
1465	- msgid "A ~~term with the name provided already exists with this parent.~~"
1466	msgstr ""
1467
1468	- #: wpsc-admin/~~display-groups~~.~~page.~~php:93
1469	- msgid "~~Thanks,~~ ~~the category has been edited~~"
1470	msgstr ""
1471
1472	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~120~~
1473	- msgid "~~You~~ ~~are editing the "[categorisation]" Category~~"
1474	msgstr ""
1475
1476	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~123~~
1477	- msgid "~~Add~~ ~~New Category~~"
1478	msgstr ""
1479
1480	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~206~~
1481	- #: ~~wpsc-admin/includes/variations_table_class.php:168~~
1482	- #: wpsc-admin/includes/variations_table_class.php:472
1483	- #: wpsc-admin/includes/products.php:159 wpsc-admin/includes/products.php:398
1484	- #: wpsc-admin/display-coupons.php:302 wpsc-admin/display-coupons.php:382
1485	- #: wpsc-admin/display-variations.page.php:14
1486	- #: wpsc-admin/display-variations.page.php:118
1487	- #: wpsc-admin/display-variations.page.php:228
1488	- #: wpsc-includes/product-template.php:595
1489	- msgid "Edit"
1490	msgstr ""
1491
1492	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~209~~
1493	- #: ~~wpsc-admin/display-groups.page.php:529~~
1494	- #: wpsc-admin/includes/settings-pages/checkout.php:205
1495	- #: wpsc-admin/includes/display-items-functions.php:595
1496	- #: wpsc-admin/includes/products.php:406 wpsc-admin/admin.php:314
1497	- #: wpsc-admin/display-sales-logs.php:390
1498	- #: wpsc-admin/display-variations.page.php:191
1499	- #: wpsc-admin/display-variations.page.php:204
1500	- #: wpsc-admin/display-variations.page.php:229
1501	- #: wpsc-admin/ajax-and-init.php:1675
1502	- #: wpsc-taxes/controllers/taxes_controller.class.php:564
1503	- #: wpsc-shipping/tablerate.php:66 wpsc-shipping/weightrate.php:58
1504	- msgid "Delete"
1505	msgstr ""
1506
1507	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~306~~
1508	- #: ~~wpsc-admin/includes/display-items-functions.php:604~~
1509	- msgid "Description"
1510	msgstr ""
1511
1512	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~311~~
1513	- msgid "~~Category~~ ~~Parent~~"
1514	msgstr ""
1515
1516	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~327~~
1517	- msgid "~~Advanced~~ ~~Settings~~"
1518	msgstr ""
1519
1520	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~330~~
1521	- msgid "~~Presentation~~ ~~Settings~~"
1522	msgstr ""
1523
1524	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~337~~
1525	- msgid "~~Catalog~~ ~~View~~"
1526	msgstr ""
1527
1528	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~370~~
1529	- msgid ""
1530	- "To over-ride the presentation settings for this group you can enter in your "
1531	- "prefered settings here"
1532	msgstr ""
1533
1534	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~373~~
1535	- #: ~~wpsc-includes/form-display.functions.php:9~~
1536	- msgid "Please select"
1537	msgstr ""
1538
1539	- #: wpsc-admin/~~display-groups~~.~~page.~~php:~~374~~
1540	- #: ~~wpsc-admin/includes/settings-pages/presentation.php:476~~
1541	- ~~msgid~~ "~~Default~~ ~~View~~"



















1542	msgstr ""
1543
1544	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~377~~
1545	- #: ~~wpsc-admin/display-groups.page.php:379~~
1546	- #: ~~wpsc-admin/includes/settings-pages/presentation.php:480~~
1547	- ~~#: wpsc-admin/includes/settings-pages/presentation.php:484~~




























1548	msgid "List View"
1549	msgstr ""
1550
1551	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~382~~
1552	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~384~~
1553	- #: wpsc-admin/includes/~~settings~~-~~pages/presentation~~.php:~~490~~
1554	- #: wpsc-admin/includes/~~settings~~-~~pages/presentation~~.php:~~494~~


1555	msgid "Grid View"
1556	msgstr ""
1557
1558	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~394~~
1559	- ~~msgid~~ ~~"Thumbnail Size"~~



1560	msgstr ""
1561
1562	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~397~~
1563	- #: ~~wpsc-admin/includes/settings-pages/presentation.php:991~~
1564	- #: wpsc-admin/includes/settings-pages/presentation.php:1001
1565	- #: wpsc-admin/includes/settings-pages/presentation.php:1010
1566	- #: wpsc-admin/includes/settings-pages/presentation.php:1133
1567	- #: wpsc-admin/includes/display-items-functions.php:488
1568	- msgid "Height"
1569	msgstr ""
1570
1571	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~398~~
1572	- #: wpsc-admin/includes/~~settings~~-~~pages/presentation~~.php:~~990~~
1573	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1000~~
1574	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1009~~
1575	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1134~~
1576	- #: wpsc-admin/includes/~~display~~-~~items-functions~~.php:~~501~~

1577	msgid "Width"
1578	msgstr ""
1579
1580	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~402~~
1581	- ~~msgid~~ ~~"Delete Image"~~
1582	- ~~msgstr~~ ""
1583	-
1584	- #: wpsc-admin/~~display~~-~~groups~~.~~page.~~php:~~411~~
1585	- ~~msgid~~ ~~"Shortcodes and Template Tags"~~


1586	msgstr ""
1587
1588	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~433~~

1589	msgid "Target Market Restrictions"
1590	msgstr ""
1591
1592	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~442~~

1593	#: wpsc-admin/includes/settings-pages/general.php:52
1594	msgid "Target Markets"
1595	msgstr ""
1596
1597	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~447~~
1598	msgid ""
1599	"The Target Markets feature has been disabled because you have the Suhosin "
1600	"PHP extension installed on this server. If you need to use the Target "
	@@ -1603,50 +1671,86 @@ msgid ""
1603	"\t\t\t"
1604	msgstr ""
1605
1606	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~473~~
1607	- #: wpsc-admin/~~display-sales-logs.php:289 wpsc-admin~~/~~display~~-~~sales-logs~~.php:~~290~~
1608	msgid "Checkout Settings"
1609	msgstr ""
1610
1611	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~481~~
1612	msgid "This category requires additional checkout form fields"
1613	msgstr ""
1614
1615	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~485~~


1616	msgid "None"
1617	msgstr ""
1618
1619	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~505~~

1620	msgid "Products in this category use the billing address to calculate shipping"
1621	msgstr ""
1622
1623	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~528~~
1624	- msgid "~~Edit~~ ~~Category~~"
1625	msgstr ""
1626
1627	- #: wpsc-admin/~~display~~-~~groups~~.~~page~~.php:~~532~~
1628	- msgid "~~Add Category~~"


1629	msgstr ""
1630
1631	- #: wpsc-admin/includes/~~purchlogs_upgrade~~.php:62
1632	- msgid "~~Check~~ ~~Out Form Fields updated.~~"
1633	- ~~msgid_plural~~ "~~Check Out Form Fields updated.~~"
1634	- msgstr[0] ""
1635	- msgstr[1] ""
1636
1637	- #: wpsc-admin/includes/~~purchlogs_upgrade.php:68 wpsc~~-~~admin/admin~~.php:~~403~~
1638	- #: ~~wpsc-admin/admin.php:430~~ ~~wpsc-admin/display-sales-logs.php:37~~
1639	- msgid "Sales"
1640	msgstr ""
1641
1642	- #: wpsc-admin/includes/~~purchlogs_upgrade~~.php:69




1643	msgid ""
1644	- "~~Upgrading~~ to WP ~~e-Commerce~~ ~~3.7~~ ~~and~~ ~~later~~ ~~requires~~ ~~you~~ to ~~run~~ ~~this~~ ~~fix once.~~"
1645	- "~~The~~ ~~following~~ ~~Boxes~~ ~~corresponds to the form fields in your current checkout~~ "
1646	- ~~"page. All~~ ~~you have to do is select from the drop-down menu box what each of~~ "
1647	- ~~"the following fields represent. Sorry for any inconvenience caused, but "~~
1648	- ~~"we're~~ ~~sure you'll agree that the new purchase logs are worth this minor "~~
1649	- "~~hassle.~~ "






























1650	msgstr ""
1651
1652	#: wpsc-admin/includes/settings-pages/presentation.php:48
	@@ -1657,11 +1761,17 @@ msgstr ""
1657	msgid "You did not specify any template files to be moved."
1658	msgstr ""
1659
1660	- #: wpsc-admin/includes/settings-pages/presentation.php:65






1661	msgid "Thanks, the themes have been copied."
1662	msgstr ""
1663
1664	- #: wpsc-admin/includes/settings-pages/presentation.php:73
1665	msgid ""
1666	"Thanks, you have made a succesful backup of your theme. It is located at "
1667	"the URL below. Please note each backup you create will replace your "
	@@ -1669,15 +1779,15 @@ msgid ""
1669	msgstr ""
1670
1671	#. Some themes have been moved to the themes folder
1672	- #: wpsc-admin/includes/settings-pages/presentation.php:83
1673	msgid "Some Theme files have been moved to your WordPress Theme Folder."
1674	msgstr ""
1675
1676	- #: wpsc-admin/includes/settings-pages/presentation.php:85
1677	msgid "No Theme files have been moved to your WordPress Theme Folder."
1678	msgstr ""
1679
1680	- #: wpsc-admin/includes/settings-pages/presentation.php:91
1681	msgid ""
1682	"WP e-Commerce provides you the ability to move your theme files to a safe "
1683	"place for theming control.\n"
	@@ -1687,365 +1797,382 @@ msgid ""
1687	"files to your active WordPress theme. "
1688	msgstr ""
1689
1690	- #: wpsc-admin/includes/settings-pages/presentation.php:~~109~~
1691	msgid ""
1692	"To change the look of certain aspects of your shop, you can edit the moved "
1693	"files that are found here:"
1694	msgstr ""
1695
1696	- #: wpsc-admin/includes/settings-pages/presentation.php:~~119~~
1697	msgid ""
1698	"You can create a copy of your WordPress Theme by clicking the backup button "
1699	"bellow. Once copied you can find them here:"
1700	msgstr ""
1701
1702	- #: wpsc-admin/includes/settings-pages/presentation.php:~~123~~
1703	msgid "<a href=\"%s\" class=\"button\">Backup Your WordPress Theme</a>"
1704	msgstr ""
1705
1706	- #: wpsc-admin/includes/settings-pages/presentation.php:~~128~~
1707	msgid ""
1708	"If you have moved your files in some other way i.e FTP, you may need to "
1709	"click the Flush Theme Cache. This will refresh the locations WordPress looks "
1710	"for your templates."
1711	msgstr ""
1712
1713	- #: wpsc-admin/includes/settings-pages/presentation.php:~~129~~
1714	msgid "<a href=\"%s\" class=\"button\">Flush Theme Cache</a>"
1715	msgstr ""
1716
1717	- #: wpsc-admin/includes/settings-pages/presentation.php:~~158~~
1718	msgid "Show All Products"
1719	msgstr ""
1720
1721	- #: wpsc-admin/includes/settings-pages/presentation.php:~~165~~
1722	msgid "Show list of product categories"
1723	msgstr ""
1724
1725	- #: wpsc-admin/includes/settings-pages/presentation.php:~~219~~
1726	msgid "Button Settings"
1727	msgstr ""
1728
1729	- #: wpsc-admin/includes/settings-pages/presentation.php:~~223~~
1730	msgid "Button Type"
1731	msgstr ""
1732
1733	- #: wpsc-admin/includes/settings-pages/presentation.php:~~246~~
1734	msgid ""
1735	"Buy Now Button only works for Paypal Standard, please activate Paypal "
1736	"Standard to enable this option."
1737	msgstr ""
1738
1739	- #: wpsc-admin/includes/settings-pages/presentation.php:~~255~~
1740	msgid "Hide \"Add to cart\" button"
1741	msgstr ""
1742
1743	- #: wpsc-admin/includes/settings-pages/presentation.php:~~277~~
1744	msgid "Product Settings"
1745	msgstr ""
1746
1747	- #: wpsc-admin/includes/settings-pages/presentation.php:~~313~~




1748	msgid "Show Stock Availability"
1749	msgstr ""
1750
1751	- #: wpsc-admin/includes/settings-pages/presentation.php:~~322~~
1752	msgid "Display Fancy Purchase Notifications"
1753	msgstr ""
1754
1755	- #: wpsc-admin/includes/settings-pages/presentation.php:~~346~~
1756	msgid "Display per item shipping"
1757	msgstr ""
1758
1759	- #: wpsc-admin/includes/settings-pages/presentation.php:~~368~~
1760	msgid "Disable link in Title"
1761	msgstr ""
1762
1763	- #: wpsc-admin/includes/settings-pages/presentation.php:~~392~~
1764	msgid "Add quantity field to each product description"
1765	msgstr ""
1766
1767	- #: wpsc-admin/includes/settings-pages/presentation.php:~~421~~
1768	msgid "Product Page Settings"
1769	msgstr ""
1770
1771	- #: wpsc-admin/includes/settings-pages/presentation.php:~~424~~
1772	msgid "Product Display"
1773	msgstr ""
1774
1775	- #: wpsc-admin/includes/settings-pages/presentation.php:~~501~~
1776	msgid "Purchase unavailable options"
1777	msgstr ""
1778
1779	- #: wpsc-admin/includes/settings-pages/presentation.php:~~511~~
1780	msgid "Products Per Row"
1781	msgstr ""
1782
1783	- #: wpsc-admin/includes/settings-pages/presentation.php:~~515~~
1784	msgid "Show images only"
1785	msgstr ""
1786
1787	- #: wpsc-admin/includes/settings-pages/presentation.php:~~519~~
1788	- #: wpsc-admin/display-variations.page.php:36
1789	msgid "Display Variations"
1790	msgstr ""
1791
1792	- #: wpsc-admin/includes/settings-pages/presentation.php:~~523~~
1793	msgid "Display Description"
1794	msgstr ""
1795
1796	- #: wpsc-admin/includes/settings-pages/presentation.php:~~527~~
1797	msgid "Display \"Add To Cart\" Button"
1798	msgstr ""
1799
1800	- #: wpsc-admin/includes/settings-pages/presentation.php:~~531~~
1801	msgid "Display \"More Details\" Button"
1802	msgstr ""
1803
1804	- #: wpsc-admin/includes/settings-pages/presentation.php:~~546~~
1805	msgid "Show list of categories"
1806	msgstr ""
1807
1808	- #: wpsc-admin/includes/settings-pages/presentation.php:~~555~~
1809	msgid "Select what product category you want to display on the products page"
1810	msgstr ""
1811
1812	- #: wpsc-admin/includes/settings-pages/presentation.php:~~583~~
1813	msgid "Sort Product By"
1814	msgstr ""
1815
1816	- #: wpsc-admin/includes/settings-pages/presentation.php:~~592~~
1817	msgid "Drag & Drop"
1818	msgstr ""
1819
1820	- #: wpsc-admin/includes/settings-pages/presentation.php:~~594~~
1821	msgid "Time Uploaded"
1822	msgstr ""
1823
1824	- #: wpsc-admin/includes/settings-pages/presentation.php:~~600~~
1825	msgid "Show Breadcrumbs"
1826	msgstr ""
1827
1828	- #: wpsc-admin/includes/settings-pages/presentation.php:~~625~~
1829	msgid "Product Groups/Products Display"
1830	msgstr ""
1831
1832	- #: wpsc-admin/includes/settings-pages/presentation.php:~~642~~
1833	msgid "Product Groups Only (All products displayed)"
1834	msgstr ""
1835
1836	- #: wpsc-admin/includes/settings-pages/presentation.php:~~643~~
1837	msgid "Sliding Product Groups (1 product per page)"
1838	msgstr ""
1839
1840	- #: wpsc-admin/includes/settings-pages/presentation.php:~~649~~
1841	msgid "Show Subcategory Products in Parent Category"
1842	msgstr ""
1843
1844	- #: wpsc-admin/includes/settings-pages/presentation.php:~~674~~
1845	msgid "Show Search"
1846	msgstr ""
1847
1848	- #: wpsc-admin/includes/settings-pages/presentation.php:~~715~~
1849	msgid "Show Advanced Search"
1850	msgstr ""
1851
1852	- #: wpsc-admin/includes/settings-pages/presentation.php:~~718~~
1853	msgid "Use Live Search"
1854	msgstr ""
1855
1856	- #: wpsc-admin/includes/settings-pages/presentation.php:~~728~~
1857	msgid "Replace Page Title With Product/Category Name"
1858	msgstr ""
1859
1860	- #: wpsc-admin/includes/settings-pages/presentation.php:~~749~~
1861	msgid "Display Featured Product above Product Pages"
1862	msgstr ""
1863
1864	- #: wpsc-admin/includes/settings-pages/presentation.php:~~772~~
1865	msgid "Shopping Cart Settings"
1866	msgstr ""
1867
1868	- #: wpsc-admin/includes/settings-pages/presentation.php:~~801~~




1869	msgid "Page"
1870	msgstr ""
1871
1872	- #: wpsc-admin/includes/settings-pages/presentation.php:~~805~~
1873	- #: wpsc-admin/includes/settings-pages/presentation.php:~~809~~
1874	msgid "Widget"
1875	msgstr ""
1876
1877	- #: wpsc-admin/includes/settings-pages/presentation.php:~~809~~
1878	- #: wpsc-admin/includes/settings-pages/presentation.php:~~819~~
1879	msgid "You need to enable the widgets plugin to use this"
1880	msgstr ""
1881
1882	- #: wpsc-admin/includes/settings-pages/presentation.php:815
1883	#: wpsc-admin/includes/settings-pages/presentation.php:820

1884	#: wpsc-admin/display-upgrades.page.php:22
1885	msgid "DropShop"
1886	msgstr ""
1887
1888	- #: wpsc-admin/includes/settings-pages/presentation.php:~~819~~
1889	- #: wpsc-admin/includes/settings-pages/presentation.php:~~820~~
1890	msgid "You need to install the Gold and DropShop extentions to use this"
1891	msgstr ""
1892
1893	- #: wpsc-admin/includes/settings-pages/presentation.php:~~825~~
1894	msgid "Manual"
1895	msgstr ""
1896
1897	- #: wpsc-admin/includes/settings-pages/presentation.php:~~834~~
1898	msgid "Show Dropshop on every page"
1899	msgstr ""
1900
1901	- #: wpsc-admin/includes/settings-pages/presentation.php:~~837~~
1902	msgid "Show Dropshop only on product page"
1903	msgstr ""
1904
1905	- #: wpsc-admin/includes/settings-pages/presentation.php:~~842~~
1906	msgid "Use light Dropshop style"
1907	msgstr ""
1908
1909	- #: wpsc-admin/includes/settings-pages/presentation.php:~~845~~
1910	msgid "Use dark Dropshop style"
1911	msgstr ""
1912
1913	- #: wpsc-admin/includes/settings-pages/presentation.php:~~848~~
1914	msgid "Crafty"
1915	msgstr ""
1916
1917	- #: wpsc-admin/includes/settings-pages/presentation.php:~~857~~
1918	msgid "Display \"+ Postage & Tax\""
1919	msgstr ""
1920
1921	- #: wpsc-admin/includes/settings-pages/presentation.php:~~880~~
1922	- msgid "Product ~~Group~~ Settings"
1923	msgstr ""
1924
1925	- #: wpsc-admin/includes/settings-pages/presentation.php:~~884~~
1926	- msgid "Show Product ~~Group~~ Description"
1927	msgstr ""
1928
1929	- #: wpsc-admin/includes/settings-pages/presentation.php:~~908~~
1930	- msgid "Show Product ~~Group~~ Thumbnails"
1931	msgstr ""
1932
1933	- #: wpsc-admin/includes/settings-pages/presentation.php:~~934~~
1934	- msgid "Show Product Count per Product ~~Group~~"
1935	msgstr ""
1936
1937	- #: wpsc-admin/includes/settings-pages/presentation.php:~~983~~
1938	msgid "Thumbnail Settings"
1939	msgstr ""
1940
1941	- #: wpsc-admin/includes/settings-pages/presentation.php:~~984~~
1942	msgid ""
1943	"Note: Anytime you update any of the thumbnail settings, WPeC will "
1944	"automatically resize all of your thumbnails for you. Depending on how many "
1945	"images you have, this could take awhile."
1946	msgstr ""
1947
1948	- #: wpsc-admin/includes/settings-pages/presentation.php:~~988~~

1949	msgid "Default Product Thumbnail Size"
1950	msgstr ""
1951
1952	- #: wpsc-admin/includes/settings-pages/presentation.php:~~997~~
1953	msgid "Default Product Group Thumbnail Size"
1954	msgstr ""
1955
1956	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1006~~

1957	msgid "Single Product Image Size"
1958	msgstr ""
1959
1960	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1029~~
1961	msgid "Crop Thumbnails"
1962	msgstr ""
1963
1964	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1034~~
1965	msgid ""
1966	"Choosing \"Yes\" means that thumbnails are cropped to exact dimensions "
1967	"(normally thumbnails are proportional)"
1968	msgstr ""
1969
1970	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1063~~
1971	msgid "Use Lightbox Effect for product images"
1972	msgstr ""
1973
1974	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1081~~
1975	msgid ""
1976	"Using lightbox means that when clicking on a product image, a larger version "
1977	"will be displayed in a \"lightbox\" style window. If you are using a plugin "
1978	"such as Shutter Reloaded, you may want to disable lightbox."
1979	msgstr ""
1980
1981	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1085~~
1982	msgid "Lightbox script to use"
1983	msgstr ""
1984
1985	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1096~~
1986	msgid "Colorbox"
1987	msgstr ""
1988
1989	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1097~~
1990	msgid "Thickbox"
1991	msgstr ""
1992
1993	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1106~~
1994	msgid "Show Thumbnail Gallery"
1995	msgstr ""
1996
1997	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1130~~
1998	msgid "Gallery Thumbnail Image Size"
1999	msgstr ""
2000
2001	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1145~~
2002	msgid "Pagination settings"
2003	msgstr ""
2004
2005	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1149~~
2006	msgid "Use Pagination"
2007	msgstr ""
2008
2009	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1171~~
2010	msgid "number of products to show per page"
2011	msgstr ""
2012
2013	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1178~~
2014	msgid "Page Number position"
2015	msgstr ""
2016
2017	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1183~~
2018	msgid "Top"
2019	msgstr ""
2020
2021	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1186~~
2022	msgid "Bottom"
2023	msgstr ""
2024
2025	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1189~~
2026	msgid "Both"
2027	msgstr ""
2028
2029	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1196~~
2030	msgid "Comment Settings"
2031	msgstr ""
2032
2033	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1200~~
2034	msgid "Use IntenseDebate Comments"
2035	msgstr ""
2036
2037	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1224~~
2038	msgid "IntenseDebate Account ID"
2039	msgstr ""
2040
2041	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1226~~
2042	msgid "Help on finding the Account ID"
2043	msgstr ""
2044
2045	- #: wpsc-admin/includes/settings-pages/presentation.php:~~1235~~
2046	msgid "By Default Display Comments on"
2047	msgstr ""
2048








2049	#: wpsc-admin/includes/settings-pages/admin.php:7
2050	msgid "Admin Settings"
2051	msgstr ""
	@@ -2081,6 +2208,10 @@ msgstr ""
2081	msgid "Purchase Receipt - Reply Name"
2082	msgstr ""
2083




2084	#: wpsc-admin/includes/settings-pages/admin.php:110
2085	msgid "Custom Messages"
2086	msgstr ""
	@@ -2089,6 +2220,18 @@ msgstr ""
2089	msgid "Tags can be used"
2090	msgstr ""
2091












2092	#: wpsc-admin/includes/settings-pages/admin.php:134
2093	msgid "Admin Report"
2094	msgstr ""
	@@ -2097,6 +2240,15 @@ msgstr ""
2097	msgid "Track and Trace settings"
2098	msgstr ""
2099









2100	#: wpsc-admin/includes/settings-pages/admin.php:149
2101	msgid "Tracking Email Subject"
2102	msgstr ""
	@@ -2113,6 +2265,107 @@ msgid ""
2113	"quantity, is limited quantity</p>"
2114	msgstr ""
2115





































































































2116	#: wpsc-admin/includes/settings-pages/checkout.php:35
2117	msgid "Users must register before checking out"
2118	msgstr ""
	@@ -2161,10 +2414,33 @@ msgid "Add new Form Set"
2161	msgstr ""
2162
2163	#: wpsc-admin/includes/settings-pages/checkout.php:134
2164	- #: wpsc-admin/display-variations.page.php:232
2165	msgid "Add"
2166	msgstr ""
2167
























2168	#: wpsc-admin/includes/settings-pages/checkout.php:208
2169	msgid "This will be the Email address that the Purchase Reciept is sent to."
2170	msgstr ""
	@@ -2254,37 +2530,35 @@ msgid ""
2254	"The Target Markets feature has been disabled because you have the Suhosin "
2255	"PHP extension installed on this server. If you need to use the Target "
2256	"Markets feature then disable the suhosin extension, if you can not do this, "
2257	- "you will need to contact your hosting provider~~.\n~~"
2258	- " "
2259	msgstr ""
2260
2261	- #: wpsc-admin/includes/settings-pages/general.php:85
2262	msgid "Currency Settings"
2263	msgstr ""
2264
2265	- #: wpsc-admin/includes/settings-pages/general.php:88
2266	msgid "Currency Type"
2267	msgstr ""
2268
2269	- #: wpsc-admin/includes/settings-pages/general.php:~~113~~
2270	msgid "Currency Sign Location"
2271	msgstr ""
2272
2273	- #: wpsc-admin/includes/settings-pages/general.php:~~149~~
2274	msgid "Thousands and decimal separators"
2275	msgstr ""
2276
2277	- #: wpsc-admin/includes/settings-pages/general.php:~~151~~
2278	msgid "Thousands separator"
2279	msgstr ""
2280
2281	- #: wpsc-admin/includes/settings-pages/general.php:~~152~~
2282	msgid "Decimal separator"
2283	msgstr ""
2284
2285	- #: wpsc-admin/includes/settings-pages/general.php:~~153~~
2286	- #: ~~wpsc-admin/includes/products.php~~:~~165~~
2287	- msgid "Preview"
2288	msgstr ""
2289
2290	#: wpsc-admin/includes/settings-pages/taxes.php:12
	@@ -2346,31 +2620,26 @@ msgstr ""
2346	msgid "Tax Rates"
2347	msgstr ""
2348
2349	- #: wpsc-admin/includes/settings-pages/taxes.php:~~126~~
2350	- msgid ""
2351	- "Note: Tax is not applied to shipping when product prices are tax inclusive."
2352	- msgstr ""
2353	-
2354	- #: wpsc-admin/includes/settings-pages/taxes.php:140
2355	msgid "Add New Tax Rate"
2356	msgstr ""
2357
2358	- #: wpsc-admin/includes/settings-pages/taxes.php:~~145~~
2359	msgid "Tax Bands"
2360	msgstr ""
2361
2362	- #: wpsc-admin/includes/settings-pages/taxes.php:~~149~~
2363	msgid ""
2364	"Note: Tax Bands are special tax rules you can create and apply on a per-"
2365	"product basis. <br /> Please visit the product page to apply your Tax Band."
2366	msgstr ""
2367
2368	- #: wpsc-admin/includes/settings-pages/taxes.php:~~153~~
2369	msgid ""
2370	"Note: Tax Bands do not take affect when product prices are tax exclusive."
2371	msgstr ""
2372
2373	- #: wpsc-admin/includes/settings-pages/taxes.php:~~166~~
2374	msgid "Add New Tax Band"
2375	msgstr ""
2376
	@@ -2418,11 +2687,18 @@ msgstr ""
2418	msgid "Enable Free Shipping Discount"
2419	msgstr ""
2420
2421	- #: wpsc-admin/includes/settings-pages/shipping.php:~~168~~







2422	msgid "Shipping Modules"
2423	msgstr ""
2424
2425	- #: wpsc-admin/includes/settings-pages/shipping.php:~~172~~
2426	msgid ""
2427	"To enable shipping in WP e-Commerce you must select which shipping methods "
2428	"you want to enable on your site.<br /> If you want to use fixed-price "
	@@ -2432,15 +2708,15 @@ msgid ""
2432	"\">Simple shipping</a>. It will appear in the list as \"Fixed rate\"."
2433	msgstr ""
2434
2435	- #: wpsc-admin/includes/settings-pages/shipping.php:~~176~~
2436	msgid "Internal Shipping Calculators"
2437	msgstr ""
2438
2439	- #: wpsc-admin/includes/settings-pages/shipping.php:~~198~~
2440	msgid "External Shipping Calculators"
2441	msgstr ""
2442
2443	- #: wpsc-admin/includes/settings-pages/shipping.php:~~201~~
2444	msgid ""
2445	"The following shipping modules all need cURL which is not installed on this "
2446	"server, you may need to contact your web hosting provider to get it set up. "
	@@ -2468,264 +2744,256 @@ msgstr ""
2468	msgid "GST/Tax Rate"
2469	msgstr ""
2470
2471	- #: wpsc-admin/includes/~~variations_table_class~~.php:79
2472	- msgid "~~Cheatin’ uh?~~"


2473	msgstr ""
2474
2475	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~119~~
2476	- ~~msgctxt~~ "~~posts~~"
2477	- ~~msgid~~ "~~Mine <span class=\~~"~~count\">(%s)</span>"~~
2478	- msgid_plural "Mine <span class=\"count\">(%s)</span>"
2479	- msgstr[0] ""
2480	- msgstr[1] ""
2481	-
2482	- #: wpsc-admin/includes/variations_table_class.php:130
2483	- msgctxt "posts"
2484	- msgid "All <span class=\"count\">(%s)</span>"
2485	- msgid_plural "All <span class=\"count\">(%s)</span>"
2486	- msgstr[0] ""
2487	- msgstr[1] ""
2488	-
2489	- #: wpsc-admin/includes/variations_table_class.php:152
2490	- msgctxt "posts"
2491	- msgid "Sticky <span class=\"count\">(%s)</span>"
2492	- msgid_plural "Sticky <span class=\"count\">(%s)</span>"
2493	- msgstr[0] ""
2494	- msgstr[1] ""
2495
2496	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~166~~
2497	- ~~msgid~~ ~~"Restore"~~


2498	msgstr ""
2499
2500	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~171~~
2501	- msgid "~~Delete~~ ~~Permanently~~"
2502	msgstr ""
2503
2504	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~173~~
2505	- ~~msgid~~ ~~"Move to Trash"~~

2506	msgstr ""
2507
2508	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~189~~
2509	- ~~msgid~~ ~~"View all categories"~~

2510	msgstr ""
2511
2512	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~199~~
2513	- #: ~~wpsc-admin/display-sales-logs~~.~~php:441~~
2514	- msgid "Filter"
2515	msgstr ""
2516
2517	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~206~~
2518	- msgid "~~Empty~~ ~~Trash~~"
2519	msgstr ""
2520
2521	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~457~~
2522	- #: ~~wpsc-admin/includes/variations_table_class.php:463~~
2523	- #: wpsc-admin/includes/products.php:131
2524	- msgid "Edit “%s”"
2525	msgstr ""
2526
2527	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~472~~
2528	- msgid "~~Edit~~ ~~this~~ ~~item~~"
2529	msgstr ""
2530
2531	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~473~~
2532	- msgid "~~Edit~~ ~~this item inline~~"
2533	msgstr ""
2534
2535	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~473~~
2536	- ~~msgid~~ ~~"Quick Edit"~~

2537	msgstr ""
2538
2539	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~678~~
2540	- #: ~~wpsc-admin/includes/products.php:513~~
2541	- msgid "Bulk Edit"
2542	msgstr ""
2543
2544	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~678~~
2545	- #: wpsc-admin/includes/~~products.php:160 wpsc~~-~~admin/includes/products~~.php:~~513~~
2546	- msgid "~~Quick Edit~~"
2547	msgstr ""
2548
2549	- #: wpsc-admin/includes/~~variations_table_class~~.php:~~690~~
2550	- #: ~~wpsc-admin/includes/products.php:525~~
2551	- msgid "Title"
2552	msgstr ""
2553
2554	- #: wpsc-admin/includes/display-items-functions.php:~~114~~
2555	msgid ""
2556	- "This Product has variations, to edit the ~~price~~ please use the ~~%1s~~ Variation "
2557	- "Controls~~%2s~~ below."
2558	msgstr ""
2559
2560	- #: wpsc-admin/includes/display-items-functions.php:~~115~~
2561	- msgid "~~Price:~~ %s ~~and~~ ~~above~~."
2562	- ~~msgstr~~ ""


2563
2564	- #: wpsc-admin/includes/display-items-functions.php:~~124~~
2565	- #: ~~wpsc-admin/display-items.page.php~~:~~49 wpsc-admin/display-items.page.php:62~~
2566	- #: wpsc-admin/display-items.page.php:77
2567	- msgid "Sale Price"
2568	msgstr ""
2569
2570	- #: wpsc-admin/includes/display-items-functions.php:~~131~~
2571	- msgid "~~New~~ ~~Currency~~"







2572	msgstr ""
2573
2574	- #: wpsc-admin/includes/display-items-functions.php:~~174~~
2575	- msgid "~~This is a donation, checking this box populates the donations widget.~~"


2576	msgstr ""
2577
2578	- #: wpsc-admin/includes/display-items-functions.php:~~177~~
2579	- msgid "~~Table~~ ~~Rate Price~~"
2580	msgstr ""
2581
2582	- #: wpsc-admin/includes/display-items-functions.php:~~183~~
2583	- msgid "~~Quantity In Cart~~"
2584	- ~~msgstr~~ ""
2585	-
2586	- #: wpsc-admin/includes/display-items-functions.php:184
2587	- msgid "Discounted Price"
2588	msgstr ""
2589
2590	- #: wpsc-admin/includes/display-items-functions.php:~~229~~
2591	- ~~msgid~~ ~~"Stock Keeping Unit"~~

2592	msgstr ""
2593
2594	- #: wpsc-admin/includes/display-items-functions.php:~~239~~
2595	- msgid "I ~~have~~ ~~limited~~ ~~stock~~ ~~for this Product~~"
2596	msgstr ""
2597
2598	- #: wpsc-admin/includes/display-items-functions.php:~~249~~
2599	- msgid ""
2600	- "This Product has variations, to edit the quantity please use the Variation "
2601	- "Controls below."
2602	msgstr ""
2603
2604	- #: wpsc-admin/includes/display-items-functions.php:~~250~~
2605	- msgid "%s ~~variant~~ ~~item~~ in ~~stock.~~"
2606	- msgid_plural "%s variant items in stock."
2607	- msgstr[0] ""
2608	- msgstr[1] ""
2609	-
2610	- #: wpsc-admin/includes/display-items-functions.php:252
2611	- msgid "Quantity:"
2612	msgstr ""
2613
2614	- #: wpsc-admin/includes/display-items-functions.php:~~257~~
2615	- msgid "~~Notify~~ ~~site~~ ~~owner and unpublish this Product if stock runs out~~"
2616	msgstr ""
2617
2618	- #: wpsc-admin/includes/display-items-functions.php:~~259~~
2619	msgid ""
2620	- "If ~~stock~~ ~~runs~~ ~~out,~~ ~~this~~ ~~Product~~ ~~will~~ ~~not~~ be ~~available~~ on ~~the~~ ~~shop~~ ~~unless you~~ "
2621	- "~~untick~~ ~~this box or add more stock~~."
2622	msgstr ""
2623
2624	- #: wpsc-admin/includes/display-items-functions.php:~~263~~
2625	- msgid "~~Stock~~ ~~Qty~~"
2626	msgstr ""
2627
2628	- #: wpsc-admin/includes/display-items-functions.php:~~265~~
2629	- msgid ""
2630	- "If this Product runs out of stock set status to Unpublished & email site "
2631	- "owner"
2632	msgstr ""
2633
2634	- #: wpsc-admin/includes/display-items-functions.php:~~292~~
2635	- #: ~~wpsc-taxes/controllers/taxes_controller.class.php:224~~
2636	- msgid "Custom Tax Band"
2637	msgstr ""
2638
2639	- #: wpsc-admin/includes/display-items-functions.php:~~330~~
2640	- msgid "~~You must first save this Product as a Draft before adding variations~~"
2641	msgstr ""
2642
2643	- #: wpsc-admin/includes/display-items-functions.php:~~382~~
2644	- msgid "~~Update Variations →~~"
2645	msgstr ""
2646
2647	- #: wpsc-admin/includes/display-items-functions.php:~~413~~
2648	- ~~msgid~~ ""
2649	- ~~"Check~~ ~~or uncheck variation boxes and then click Update Variations to add or "~~
2650	- ~~"remove~~ ~~variations.~~"
2651	msgstr ""
2652
2653	- #: wpsc-admin/includes/display-items-functions.php:~~438~~
2654	- ~~msgid~~ ~~"You have no Variations added~~."


2655	msgstr ""
2656
2657	- #: wpsc-admin/includes/display-items-functions.php:~~473~~
2658	- #: wpsc-admin/display-items~~.page.php:46 wpsc~~-~~admin/display-items~~.~~page.~~php:74
2659	- ~~msgid~~ ~~"Weight"~~

2660	msgstr ""
2661
2662	- #: wpsc-admin/includes/display-items-functions.php:~~514~~
2663	msgid "Length"
2664	msgstr ""
2665
2666	- #: wpsc-admin/includes/display-items-functions.php:~~530~~
2667	msgid "Flat Rate Settings"
2668	msgstr ""
2669
2670	- #: wpsc-admin/includes/display-items-functions.php:~~535~~
2671	msgid "Local Shipping Fee"
2672	msgstr ""
2673
2674	- #: wpsc-admin/includes/display-items-functions.php:~~544~~
2675	msgid "International Shipping Fee"
2676	msgstr ""
2677
2678	- #: wpsc-admin/includes/display-items-functions.php:~~553~~
2679	msgid "Disregard Shipping for this Product"
2680	msgstr ""
2681
2682	- #: wpsc-admin/includes/display-items-functions.php:~~582~~
2683	msgid "Custom Meta"
2684	msgstr ""
2685
2686	- #: wpsc-admin/includes/display-items-functions.php:~~583~~
2687	msgid "Add Custom Meta"
2688	msgstr ""
2689
2690	- #: wpsc-admin/includes/display-items-functions.php:~~593~~

2691	msgid "Value"
2692	msgstr ""
2693
2694	- #: wpsc-admin/includes/display-items-functions.php:~~611~~
2695	- msgid "Merchant Notes"
2696	msgstr ""
2697
2698	- #: wpsc-admin/includes/display-items-functions.php:~~618~~
2699	msgid "These notes are only available here."
2700	msgstr ""
2701
2702	- #: wpsc-admin/includes/display-items-functions.php:~~623~~
2703	msgid "Personalisation Options"
2704	msgstr ""
2705
2706	- #: wpsc-admin/includes/display-items-functions.php:~~626~~
2707	msgid ""
2708	"Users can personalize this Product by leaving a message on single product "
2709	"page"
2710	msgstr ""
2711
2712	- #: wpsc-admin/includes/display-items-functions.php:~~634~~
2713	msgid "Users can upload images on single product page to purchase logs."
2714	msgstr ""
2715
2716	- #: wpsc-admin/includes/display-items-functions.php:~~645~~
2717	- msgid "~~Prohibited~~"


2718	msgstr ""
2719
2720	- #: wpsc-admin/includes/display-items-functions.php:~~658~~
2721	msgid "Enable Comments"
2722	msgstr ""
2723
2724	- #: wpsc-admin/includes/display-items-functions.php:~~664~~




2725	msgid "Allow users to comment on this Product."
2726	msgstr ""
2727
2728	- #: wpsc-admin/includes/display-items-functions.php:~~686~~
2729	msgid ""
2730	"If this product is for sale on another website enter the link here. For "
2731	"instance if your product is an MP3 file for sale on iTunes you could put the "
	@@ -2734,113 +3002,160 @@ msgid ""
2734	"choose to open the link in a new window."
2735	msgstr ""
2736
2737	- #: wpsc-admin/includes/display-items-functions.php:~~690~~
2738	msgid "External Link"
2739	msgstr ""
2740
2741	- #: wpsc-admin/includes/display-items-functions.php:~~694~~
2742	msgid "External Link Text"
2743	msgstr ""
2744
2745	- #: wpsc-admin/includes/display-items-functions.php:~~698~~
2746	msgid "External Link Target"
2747	msgstr ""
2748
2749	- #: wpsc-admin/includes/display-items-functions.php:~~719~~
2750	- ~~msgid~~ "~~Manage~~ ~~Product~~ ~~Images~~"

2751	msgstr ""
2752
2753	- #: wpsc-admin/includes/display-items-functions.php:~~739~~
2754	- msgid "~~Upload~~ ~~New~~ ~~File~~"
2755	msgstr ""
2756
2757	- #: wpsc-admin/includes/display-items-functions.php:~~740~~
2758	- msgid "~~Max~~ ~~Upload~~ ~~Size~~"
2759	msgstr ""
2760
2761	- #: wpsc-admin/includes/display-items-functions.php:~~741~~
2762	- msgid "~~Select~~ ~~from~~ ~~existing files~~"
2763	msgstr ""
2764
2765	- #: wpsc-admin/includes/display-items-functions.php:~~764~~
2766	- msgid "~~Label~~ ~~Control~~"
2767	msgstr ""
2768
2769	- #: wpsc-admin/includes/display-items-functions.php:~~770~~
2770	- #: ~~wpsc-admin/includes/display-items-functions.php:771~~
2771	- msgid "Add Label"
2772	msgstr ""
2773
2774	- #: wpsc-admin/includes/display-items-functions.php:~~779~~
2775	- #: ~~wpsc-admin/admin.php:325~~
2776	- msgid "Label"
2777	msgstr ""
2778
2779	- #: wpsc-admin/includes/display-items-functions.php:~~783~~
2780	- #: ~~wpsc-admin/admin.php:326~~
2781	- msgid "Label Description"
2782	msgstr ""
2783
2784	- #: wpsc-admin/includes/display-items-functions.php:~~787~~
2785	- #: ~~wpsc-admin/admin.php:328~~
2786	- msgid "Life Number"
2787	msgstr ""
2788
2789	- #: wpsc-admin/includes/display-items-functions.php:~~791~~
2790	- #: ~~wpsc-admin/admin.php~~:~~327~~
2791	- msgid "Item Number"
2792	msgstr ""
2793
2794	- #: wpsc-admin/includes/display-items-functions.php:~~795~~
2795	- #: ~~wpsc-admin/admin.php:329~~
2796	- msgid "Product Code"
2797	msgstr ""
2798
2799	- #: wpsc-admin/includes/display-items-functions.php:~~799~~
2800	- #: ~~wpsc-admin/admin.php:330~~
2801	- msgid "PDF"
2802	msgstr ""
2803
2804	- #: wpsc-admin/includes/display-items-functions.php:~~820~~
2805	- ~~msgid~~ ~~"Upload Image%s"~~


2806	msgstr ""
2807
2808	- #: wpsc-admin/includes/display-items-functions.php:~~905~~
2809	- msgid "~~Small Product Thumbnail~~"










2810	msgstr ""
2811
2812	- #: wpsc-admin/includes/display-items-functions.php:~~905~~
2813	- ~~msgid~~ ~~"Medium Single Product"~~

2814	msgstr ""
2815
2816	- #: wpsc-admin/includes/display-items-functions.php:~~905~~
2817	msgid "Full Size"
2818	msgstr ""
2819
2820	- #: wpsc-admin/includes/display-items-functions.php:~~923~~
2821	msgid "(%d × %d)"
2822	msgstr ""
2823
2824	- #: wpsc-admin/includes/display-items-functions.php:~~931~~
2825	msgid "Alt text for the product image, e.g. “Rockstar T-Shirt”"
2826	msgstr ""
2827
2828	- #: wpsc-admin/includes/display-items-functions.php:~~934~~
2829	- msgid "~~Size~~"
2830	msgstr ""
2831
2832	- #: wpsc-admin/includes/display-items-functions.php:~~950~~
2833	- msgid "~~Custom Thumbnail Size~~"


2834	msgstr ""
2835
2836	- #: wpsc-admin/includes/display-items-functions.php:~~1031~~








2837	msgid "Product Image Gallery"
2838	msgstr ""
2839
2840	- #: wpsc-admin/includes/~~products~~.php:72

























2841	msgid "(no title)"
2842	msgstr ""
2843





2844	#: wpsc-admin/includes/products.php:89
2845	msgid "Unpublished"
2846	msgstr ""
	@@ -2873,64 +3188,69 @@ msgstr ""
2873	msgid "Last Modified"
2874	msgstr ""
2875
2876	- #: wpsc-admin/includes/products.php:~~159~~




2877	msgid "Edit this product"
2878	msgstr ""
2879
2880	- #: wpsc-admin/includes/products.php:~~165~~




2881	msgid "Preview “%s”"
2882	msgstr ""
2883
2884	- #: wpsc-admin/includes/products.php:~~168~~




2885	msgid "View “%s”"
2886	msgstr ""
2887
2888	- #: wpsc-admin/includes/products.php:~~168~~ wpsc-admin/includes/products.php:~~390~~
2889	msgid "View"
2890	msgstr ""
2891
2892	- #: wpsc-admin/includes/products.php:~~314~~ wpsc-admin/display-items.page.php:~~218~~
2893	msgid "Uncategorized"
2894	msgstr ""
2895
2896	- #: wpsc-admin/includes/products.php:~~332~~
2897	msgid "No Tags"
2898	msgstr ""
2899
2900	- #: wpsc-admin/includes/products.php:~~368~~
2901	msgid "%s pending"
2902	msgstr ""
2903
2904	#. translators: comment count link
2905	- #: wpsc-admin/includes/products.php:~~371~~
2906	msgctxt "comment count"
2907	msgid "0"
2908	msgstr ""
2909
2910	#. translators: comment count link
2911	- #: wpsc-admin/includes/products.php:~~371~~
2912	msgctxt "comment count"
2913	msgid "1"
2914	msgstr ""
2915
2916	#. translators: comment count link: % will be substituted by comment count
2917	- #: wpsc-admin/includes/products.php:~~371~~
2918	msgctxt "comment count"
2919	msgid "%"
2920	msgstr ""
2921
2922	- #: wpsc-admin/includes/product-functions.php:12
2923	- #: wpsc-admin/display-items.page.php:133
2924	- #: wpsc-includes/category.functions.php:56
2925	- #: wpsc-includes/category.functions.php:282
2926	- msgid "N/A"
2927	- msgstr ""
2928	-
2929	- #: wpsc-admin/includes/product-functions.php:408
2930	msgid "Could not update product in the database"
2931	msgstr ""
2932
2933	- #: wpsc-admin/includes/product-functions.php:~~425~~
2934	msgid "Could not insert product into the database"
2935	msgstr ""
2936
	@@ -2938,10 +3258,14 @@ msgstr ""
2938	msgid "Thanks, the coupon has been added."
2939	msgstr ""
2940
2941	- #: wpsc-admin/display-coupons.php:139 wpsc-admin/admin.php:93
2942	msgid "Coupons"
2943	msgstr ""
2944




2945	#: wpsc-admin/display-coupons.php:152 wpsc-admin/display-coupons.php:296
2946	#: wpsc-admin/admin-form-functions.php:13
2947	#: wpsc-admin/display-sales-logs.php:211
	@@ -2973,7 +3297,7 @@ msgstr ""
2973	msgid "Apply On All Products"
2974	msgstr ""
2975
2976	- #: wpsc-admin/display-coupons.php:172
2977	msgid "Free shipping"
2978	msgstr ""
2979
	@@ -2989,47 +3313,47 @@ msgstr ""
2989	msgid "This coupon affects each product at checkout."
2990	msgstr ""
2991
2992	- #: wpsc-admin/display-coupons.php:223
2993	msgid "Item name"
2994	msgstr ""
2995
2996	- #: wpsc-admin/display-coupons.php:224
2997	msgid "Item quantity"
2998	msgstr ""
2999
3000	- #: wpsc-admin/display-coupons.php:225
3001	msgid "Total quantity"
3002	msgstr ""
3003
3004	- #: wpsc-admin/display-coupons.php:226
3005	msgid "Subtotal amount"
3006	msgstr ""
3007
3008	- #: wpsc-admin/display-coupons.php:231
3009	msgid "Is equal to"
3010	msgstr ""
3011
3012	- #: wpsc-admin/display-coupons.php:232
3013	msgid "Is greater than"
3014	msgstr ""
3015
3016	- #: wpsc-admin/display-coupons.php:233
3017	msgid "Is less than"
3018	msgstr ""
3019
3020	- #: wpsc-admin/display-coupons.php:234
3021	msgid "Contains"
3022	msgstr ""
3023
3024	- #: wpsc-admin/display-coupons.php:235
3025	msgid "Does not contain"
3026	msgstr ""
3027
3028	- #: wpsc-admin/display-coupons.php:236
3029	msgid "Begins with"
3030	msgstr ""
3031
3032	- #: wpsc-admin/display-coupons.php:237
3033	msgid "Ends with"
3034	msgstr ""
3035
	@@ -3041,6 +3365,10 @@ msgstr ""
3041	msgid "Add New Condition"
3042	msgstr ""
3043




3044	#: wpsc-admin/display-coupons.php:398
3045	msgid ""
3046	"<strong>Note:</strong> Due to a current PayPal limitation, when a purchase "
	@@ -3049,43 +3377,81 @@ msgid ""
3049	"will see your shop name and the total within PayPal."
3050	msgstr ""
3051
3052	- #: wpsc-admin/admin.php:83
3053	msgid "Store Sales"
3054	msgstr ""
3055
3056	- #: wpsc-admin/admin.php:86
3057	msgid "Update Store"
3058	msgstr ""
3059
3060	- #: wpsc-admin/admin.php:86
3061	msgid "Store Update"
3062	msgstr ""
3063
3064	- #: wpsc-admin/admin.php:88
3065	msgid "Store Upgrades"
3066	msgstr ""
3067
3068	- #: wpsc-admin/admin.php:96 wpsc-admin/display-options-settings.page.php:16
3069	msgid "Store Settings"
3070	msgstr ""
3071
3072	- #: wpsc-admin/admin.php:96
3073	msgid "Store"
3074	msgstr ""
3075
3076	- #: wpsc-admin/admin.php:~~101~~
3077	msgid "Store Debug"
3078	msgstr ""
3079
3080	- #: wpsc-admin/admin.php:~~105~~
3081	msgid "For More Information"
3082	msgstr ""
3083
3084	- #: wpsc-admin/admin.php:~~145~~






































3085	msgid "Product Tracking Email"
3086	msgstr ""
3087
3088	- #: wpsc-admin/admin.php:~~146~~
3089	msgid ""
3090	"Track & Trace means you may track the progress of your parcel with our "
3091	"online parcel tracker, just login to our website and enter the following "
	@@ -3094,95 +3460,163 @@ msgid ""
3094	"Tracking ID: %trackid%\n"
3095	msgstr ""
3096
3097	- #: wpsc-admin/admin.php:~~315~~


































3098	msgid "Text"
3099	msgstr ""
3100
3101	- #: wpsc-admin/admin.php:~~318~~
3102	msgid "Textarea"
3103	msgstr ""
3104
3105	- #: wpsc-admin/admin.php:~~319~~
3106	msgid "Heading"
3107	msgstr ""
3108
3109	- #: wpsc-admin/admin.php:~~320~~
3110	msgid "Coupon"
3111	msgstr ""
3112
3113	- #: wpsc-admin/admin.php:~~332 wpsc-shipping/tablerate.php:61~~
























3114	#: wpsc-shipping/weightrate.php:58
3115	msgid " and above"
3116	msgstr ""
3117
3118	- #: wpsc-admin/admin.php:~~333~~ wpsc-shipping/tablerate.php:59
3119	msgid "If price is "
3120	msgstr ""
3121
3122	- #: wpsc-admin/admin.php:~~334~~ wpsc-shipping/weightrate.php:58
3123	msgid "If weight is "
3124	msgstr ""
3125
3126	- #: wpsc-admin/admin.php:~~390~~ wpsc-admin/admin-form-functions.php:~~216~~
3127	- #: wpsc-admin/display-sales-logs.php:331
3128	msgid "Current Month"
3129	msgstr ""
3130
3131	- #: wpsc-admin/admin.php:~~409~~ wpsc-admin/admin.php:~~436~~
3132	- ~~msgid~~ "~~Orders~~"

3133	msgstr ""
3134
3135	- #: wpsc-admin/admin.php:~~418~~ wpsc-admin/admin.php:~~447~~
3136	- ~~msgid~~ ~~"Avg Orders"~~







3137	msgstr ""
3138
3139	- #: wpsc-admin/admin.php:~~426 wpsc-admin/display-sales-logs.php:343~~
3140	msgid "Total Income"
3141	msgstr ""
3142
3143	- #: wpsc-admin/admin.php:~~471~~
3144	msgid "Getshopped News"
3145	msgstr ""
3146
3147	- #: wpsc-admin/admin.php:~~472~~
3148	msgid "Sales Summary"
3149	msgstr ""
3150
3151	- #: wpsc-admin/admin.php:~~473~~
3152	msgid "Sales by Quarter"
3153	msgstr ""
3154
3155	- #: wpsc-admin/admin.php:~~474~~
3156	msgid "Sales by Month"
3157	msgstr ""
3158
3159	- #: wpsc-admin/admin.php:~~532~~
3160	msgid "Financial Year End"
3161	msgstr ""
3162
3163	- #: wpsc-admin/admin.php:~~589~~ wpsc-admin/admin~~-form-functions~~.php:~~221~~

3164	msgid "At a Glance"
3165	msgstr ""
3166
3167	- #: wpsc-admin/admin.php:~~590~~
3168	msgid "Revenue"
3169	msgstr ""
3170
3171	- #: wpsc-admin/~~display-items.page.php:47 wpsc-~~admin~~/display-items~~.~~page.~~php:60
3172	- #: ~~wpsc-admin/display-items.page.php~~:75
3173	- msgid "Stock"
3174	msgstr ""
3175
3176	- #: wpsc-admin/~~display-items.page.php:50 wpsc-~~admin~~/display-items~~.~~page.~~php:63
3177	- #: ~~wpsc-admin/display-items.page.php~~:78 ~~wpsc-admin/display-sales-logs.php:135~~
3178	- msgid "SKU"
3179	msgstr ""
3180
3181	- #: wpsc-admin/~~display-items~~.~~page.~~php:51




3182	msgid "Categories"
3183	msgstr ""
3184
3185	- #: wpsc-admin/display-items.page.php:52
3186	msgid "Featured"
3187	msgstr ""
3188
	@@ -3190,14 +3624,35 @@ msgstr ""
3190	msgid "Drag to a new position"
3191	msgstr ""
3192
3193	- #: wpsc-admin/display-items.page.php:~~226 wpsc-admin/display-items.page.php:350~~
















3194	msgid "Unmark as Featured"
3195	msgstr ""
3196
3197	- #: wpsc-admin/display-items.page.php:~~228~~ wpsc-admin/display-items.page.php:~~352~~
3198	msgid "Mark as Featured"
3199	msgstr ""
3200





3201	#: wpsc-admin/display-update.page.php:40
3202	msgid "WP e-Commerce is almost ready."
3203	msgstr ""
	@@ -3212,14 +3667,42 @@ msgstr ""
3212	msgid "Update WP e-Commerce"
3213	msgstr ""
3214
3215	- #: wpsc-admin/display-update.page.php:78




























3216	msgid ""
3217	"Your WP e-Commerce database needs to be updated for WP e-Commerce 3.8. To "
3218	"perform this update, press the button below. It is highly recommended that "
3219	"you back up your database before performing this update."
3220	msgstr ""
3221
3222	- #: wpsc-admin/display-update.page.php:81
3223	msgid ""
3224	"Note: If the server times out or runs out of memory, just reload this page, "
3225	"the server will pick up where it left off."
	@@ -3278,8 +3761,12 @@ msgid ""
3278	"longer use."
3279	msgstr ""
3280




3281	#: wpsc-admin/display-upgrades.page.php:92
3282	- msgid "API Key"
3283	msgstr ""
3284
3285	#: wpsc-admin/display-upgrades.page.php:97
	@@ -3290,6 +3777,22 @@ msgstr ""
3290	msgid "Your API key has been Reset"
3291	msgstr ""
3292
















3293	#: wpsc-admin/admin-form-functions.php:149
3294	msgid "Update Coupon"
3295	msgstr ""
	@@ -3299,7 +3802,6 @@ msgid "Settings"
3299	msgstr ""
3300
3301	#: wpsc-admin/admin-form-functions.php:170
3302	- #: wpsc-admin/display-sales-logs.php:288
3303	msgid "Shop Settings"
3304	msgstr ""
3305
	@@ -3311,95 +3813,102 @@ msgstr ""
3311	msgid "Checkout Page Settings"
3312	msgstr ""
3313
3314	- #: wpsc-admin/admin-form-functions.php:~~191~~
3315	- #: ~~wpsc-admin/admin-form-functions.php:192~~
3316	- msgid "~~product~~"
3317	- ~~msgstr~~ ""


3318
3319	- #: wpsc-admin/admin-form-functions.php:~~191~~
3320	- #: ~~wpsc-admin/admin-form-functions.php:192~~
3321	- ~~msgid~~ "~~products~~"
3322	- msgstr ""

3323
3324	- #: wpsc-admin/admin-form-functions.php:~~195~~
3325	- #: ~~wpsc-admin/admin-form-functions.php:196~~
3326	- ~~msgid~~ "~~group~~"
3327	- msgstr ""

3328
3329	- #: wpsc-admin/admin-form-functions.php:~~195~~
3330	- #: ~~wpsc-admin/admin-form-functions.php:196~~
3331	- ~~msgid~~ "~~groups~~"
3332	- msgstr ""

3333
3334	- #: wpsc-admin/admin-form-functions.php:~~198~~
3335	- #: ~~wpsc-admin/admin-form-functions.php:199~~
3336	- msgid "sale"
3337	msgstr ""
3338
3339	- #: wpsc-admin/admin-form-functions.php:~~198~~
3340	- #: ~~wpsc-admin/admin-form-functions.php:199~~
3341	- ~~msgid~~ "~~sales~~"
3342	- msgstr ""

3343
3344	- #: wpsc-admin/admin-form-functions.php:~~203~~
3345	- msgid "~~variation~~"
3346	- ~~msgstr~~ ""


3347
3348	- #: wpsc-admin/admin-form-functions.php:~~203~~
3349	- msgid "~~variations~~"
3350	- ~~msgstr~~ ""






3351
3352	- #: wpsc-admin/admin-form-functions.php:~~206~~
3353	- #: ~~wpsc-admin/admin-form-functions~~.~~php:207~~
3354	- #: ~~wpsc-admin/admin-form-functions~~.~~php:209~~
3355	- ~~msgid~~ "~~transaction~~"
3356	- msgstr ""
3357
3358	- #: wpsc-admin/admin-form-functions.php:~~206~~
3359	- #: ~~wpsc~~-~~admin/admin-form-functions~~.~~php:207~~
3360	- #: wpsc-admin/admin-form-functions.php:209
3361	- msgid "transactions"
3362	msgstr ""
3363
3364	- #: wpsc-admin/admin-form-functions.php:~~247~~
3365	- msgid "~~Pending~~"
3366	msgstr ""
3367
3368	- #: wpsc-admin/admin-form-functions.php:~~261~~
3369	- msgid "~~Closed~~"
3370	msgstr ""
3371
3372	- #: wpsc-admin/admin-form-functions.php:~~268~~
3373	- ~~msgid~~ ~~"Here you can add products, groups or variations"~~

3374	msgstr ""
3375
3376	- #: wpsc-admin/admin-form-functions.php:~~277~~
3377	- msgid "~~Right~~ ~~Now~~"
3378	msgstr ""
3379
3380	- #: wpsc-admin/~~admin~~-~~form~~-~~functions~~.php:~~279~~
3381	- msgid ""
3382	- "You have <a href=\"admin.php?page=wpsc-edit-products\">:productcount:</a>, "
3383	- "contained within <a href=\"admin.php?page=wpsc-edit-groups\">:groupcount:</"
3384	- "a>. This month you made :salecount: and generated a total of :monthtotal: "
3385	- "and your total sales ever is :overaltotal:. You have :pendingcount: awaiting "
3386	- "approval."
3387	msgstr ""
3388
3389	- #: wpsc-admin/~~admin~~-~~form~~-~~functions~~.php:~~281~~
3390	- msgid "~~You~~ ~~are using the :theme: style. This is WP e-Commerce :versionnumber:.~~"
3391	msgstr ""
3392
3393	- #: wpsc-admin/~~admin~~-~~form~~-~~functions~~.php:~~304~~
3394	- msgid "~~Packing~~ ~~Slip~~"
3395	msgstr ""
3396
3397	- #: wpsc-admin/~~admin~~-~~form~~-~~functions~~.php:~~305~~
3398	- msgid "~~Order~~"
3399	msgstr ""
3400
3401	- #: wpsc-admin/admin-~~form~~-~~functions~~.php:~~494~~
3402	- msgid "~~This~~ ~~users cart was empty~~"
3403	msgstr ""
3404
3405	#: wpsc-admin/display-sales-logs.php:65
	@@ -3424,24 +3933,16 @@ msgstr[1] ""
3424	msgid ""
3425	"When upgrading the WP e-Commerce Plugin from 3.6.* to 3.7 it is required "
3426	"that you associate your checkout form fields with the new Purchase Logs "
3427	- "system. To do so please "
3428	- msgstr ""
3429	-
3430	- #: wpsc-admin/display-sales-logs.php:86 wpsc-shipping/ups.php:272
3431	- msgid "Click Here"
3432	msgstr ""
3433
3434	#: wpsc-admin/display-sales-logs.php:117
3435	msgid "Downloads for this log have been released."
3436	- ~~msgid_plural~~ "~~Downloads for this log have been released.~~"
3437	- msgstr[0] ""
3438	- msgstr[1] ""
3439
3440	#: wpsc-admin/display-sales-logs.php:121
3441	msgid "Receipt has been resent "
3442	- ~~msgid_plural~~ "~~Receipt has been resent~~ "
3443	- msgstr[0] ""
3444	- msgstr[1] ""
3445
3446	#: wpsc-admin/display-sales-logs.php:161
3447	msgid "Shipping Options"
	@@ -3507,11 +4008,6 @@ msgstr ""
3507	msgid "Items Ordered"
3508	msgstr ""
3509
3510	- #: wpsc-admin/display-sales-logs.php:221
3511	- #: wpsc-admin/display-options-settings.page.php:112
3512	- msgid "Taxes"
3513	- msgstr ""
3514	-
3515	#: wpsc-admin/display-sales-logs.php:240
3516	msgid "Order Status:"
3517	msgstr ""
	@@ -3528,11 +4024,11 @@ msgstr ""
3528	msgid "Resend Receipt to Buyer"
3529	msgstr ""
3530
3531	- #: wpsc-admin/display-sales-logs.php:269 wpsc-admin/display-sales-logs.php:~~518~~
3532	msgid "Delete this log"
3533	msgstr ""
3534
3535	- #: wpsc-admin/display-sales-logs.php:269 wpsc-admin/display-sales-logs.php:~~518~~
3536	msgid ""
3537	"You are about to delete this log '%s'\n"
3538	" 'Cancel' to stop, 'OK' to delete."
	@@ -3546,124 +4042,129 @@ msgstr ""
3546	msgid "Go Back"
3547	msgstr ""
3548
3549	- #: wpsc-admin/display-sales-logs.php:~~286~~
3550	- msgid "~~e-Commerce~~ ~~Admin Menu~~"
3551	- msgstr ""
3552	-
3553	- #: wpsc-admin/display-sales-logs.php:305
3554	- msgid "WP e-Commerce News"
3555	- msgstr ""
3556	-
3557	- #: wpsc-admin/display-sales-logs.php:327
3558	- msgid "Order Summary"
3559	msgstr ""
3560
3561	- #: wpsc-admin/display-sales-logs.php:~~339~~
3562	- msgid "~~(accepted payments)~~"
3563	msgstr ""
3564
3565	- #: wpsc-admin/display-sales-logs.php:~~348~~
3566	- ~~msgid~~ "~~Subscribe~~ ~~to your orders~~"

3567	msgstr ""
3568
3569	- #: wpsc-admin/display-sales-logs.php:~~350~~
3570	- msgid "~~Subscribe~~ ~~to an RSS feed~~"
3571	msgstr ""
3572
3573	- #: wpsc-admin/display-sales-logs.php:~~350~~
3574	- msgid "of ~~your orders~~"
3575	msgstr ""
3576
3577	- #: wpsc-admin/display-sales-logs.php:~~353~~
3578	- msgid "~~Plugin News~~"
3579	msgstr ""
3580
3581	- #: wpsc-admin/display-sales-logs.php:~~355~~
3582	- msgid ""
3583	- "The <a href=\"http://instinct.co.nz/blogshop/products-page/\" target=\"_blank"
3584	- "\">WP DropShop Module</a> is the latest and most cutting edge shopping cart "
3585	- "available online. Coupled with Grid View then your site will be the talk of "
3586	- "street! <br/><br/>The <a href=\"http://instinct.co.nz/blogshop/products-page/"
3587	- "\" target=\"_blank\">GridView Module</a> is a visual module built to enhance "
3588	- "the way your product page looks.<br/><br/><a href=\"http://www.instinct.co."
3589	- "nz/wp-campaign-monitor/100\">WP Campaign Monitor</a> is an email newsletter "
3590	- "tool built just for WP users who want to send campaigns, track the results "
3591	- "and manage their subscribers. The latest version integrates with e-commerce "
3592	- "lite meaning that you will be able to send buyers email newsletters and much "
3593	- "more. "
3594	msgstr ""
3595
3596	- #: wpsc-admin/display-sales-logs.php:~~356~~
3597	- msgid "~~This shop is powered by~~ "
3598	msgstr ""
3599
3600	- #: wpsc-admin/display-sales-logs.php:~~365~~
3601	- msgid "~~Upgrade~~ ~~to Gold~~"
3602	msgstr ""
3603
3604	- #: wpsc-admin/display-sales-logs.php:~~365~~
3605	- msgid " ~~and unleash more functionality into your shop.~~"


3606	msgstr ""
3607
3608	- #: wpsc-admin/display-sales-logs.php:~~384~~
3609	- msgid "~~Bulk~~ ~~Actions~~"
3610	- ~~msgstr~~ ""


3611
3612	- #: wpsc-admin/display-sales-logs.php:~~393~~
3613	- msgid "~~Apply~~"
3614	msgstr ""
3615
3616	- #: wpsc-admin/display-sales-logs.php:~~395~~
3617	- msgid "~~View:~~"
3618	msgstr ""
3619
3620	- #: wpsc-admin/display-sales-logs.php:~~444~~
3621	- msgid "~~There~~ ~~are~~ ~~no purchase logs for your selection, please try again.~~"
3622	msgstr ""
3623
3624	- #: wpsc-admin/display-sales-logs.php:~~461~~
3625	- msgid "~~Total:~~"
3626	msgstr ""
3627
3628	- #: wpsc-admin/display-sales-logs.php:~~473~~
3629	- msgid "~~Download~~ ~~CSV~~"
3630	msgstr ""
3631
3632	- #: wpsc-admin/display-sales-logs.php:~~482~~
3633	- msgid ""
3634	- "You are about to delete the selected purchase logs.\n"
3635	- " 'Cancel' to stop, 'OK' to delete."
3636	msgstr ""
3637
3638	- #: wpsc-admin/display-sales-logs.php:~~526~~
3639	- msgid "~~Tracking~~ ID"
3640	msgstr ""
3641
3642	- #: wpsc-admin/display-sales-logs.php:~~545~~
3643	- msgid "~~Search~~ ~~Logs~~"
3644	msgstr ""
3645
3646	#: wpsc-admin/display-options-settings.page.php:109

3647	msgid "General"
3648	msgstr ""
3649
3650	#: wpsc-admin/display-options-settings.page.php:110

3651	msgid "Presentation"
3652	msgstr ""
3653
3654	#: wpsc-admin/display-options-settings.page.php:111

3655	msgid "Admin"
3656	msgstr ""
3657










3658	#: wpsc-admin/display-options-settings.page.php:114

3659	msgid "Payments"
3660	msgstr ""
3661





3662	#: wpsc-admin/display-options-settings.page.php:116

3663	msgid "Marketing"
3664	msgstr ""
3665
3666	#: wpsc-admin/display-options-settings.page.php:117

3667	msgid "Import"
3668	msgstr ""
3669
	@@ -3685,7 +4186,7 @@ msgid "The text that people see when making a purchase"
3685	msgstr ""
3686
3687	#: wpsc-admin/display-options-settings.page.php:276
3688	- msgid " Setting options updated."
3689	msgid_plural " %s Settings options updated."
3690	msgstr[0] ""
3691	msgstr[1] ""
	@@ -3697,8 +4198,8 @@ msgstr[0] ""
3697	msgstr[1] ""
3698
3699	#: wpsc-admin/display-options-settings.page.php:286
3700	- msgid " Shipping option updated."
3701	- msgid_plural " Shipping option updated."
3702	msgstr[0] ""
3703	msgstr[1] ""
3704
	@@ -3716,78 +4217,43 @@ msgstr ""
3716	msgid "Settings successfully updated."
3717	msgstr ""
3718
3719	- #: wpsc-admin/~~display~~-~~variations~~.~~page.~~php:21
3720	- msgid "Are you sure you want to delete this product?"
3721	- msgstr ""
3722	-
3723	- #: wpsc-admin/display-variations.page.php:38
3724	- msgid ""
3725	- "A variation can be anything \"optional\" about a product. ie: Size, Color, "
3726	- "etc <br />For example: if you are selling t-shirts you might setup a "
3727	- "variation set called size with the values small, medium, large..."
3728	- msgstr ""
3729	-
3730	- #: wpsc-admin/display-variations.page.php:48
3731	- msgid "Product updated."
3732	- msgstr ""
3733	-
3734	- #: wpsc-admin/display-variations.page.php:156
3735	- msgid "Edit Variation Set"
3736	- msgstr ""
3737	-
3738	- #: wpsc-admin/display-variations.page.php:160
3739	- msgid "Add Variation Set"
3740	- msgstr ""
3741	-
3742	- #: wpsc-admin/display-variations.page.php:175
3743	- msgid "Variation Values"
3744	- msgstr ""
3745	-
3746	- #: wpsc-admin/display-variations.page.php:212
3747	- msgid "Add Value"
3748	- msgstr ""
3749	-
3750	- #: wpsc-admin/ajax-and-init.php:313
3751	msgid ""
3752	"Sorry, for some reason, we couldn't duplicate this product because it could "
3753	"not be found in the database, check there for this ID: "
3754	msgstr ""
3755
3756	- #: wpsc-admin/ajax-and-init.php:~~740~~
3757	- msgid "Your Order"
3758	- msgstr ""
3759	-
3760	- #: wpsc-admin/ajax-and-init.php:970
3761	msgid "The administrator has unlocked your file"
3762	msgstr ""
3763
3764	- #: wpsc-admin/ajax-and-init.php:~~970~~
3765	msgid ""
3766	"Dear CustomerWe are pleased to advise you that your order has been updated "
3767	"and your downloads are now active.Please download your purchase using the "
3768	"links provided below.[download_links]Thank you for your custom."
3769	msgstr ""
3770
3771	- #: wpsc-admin/ajax-and-init.php:~~1523~~
3772	msgid "Choose a downloadable file for this product:"
3773	msgstr ""
3774
3775	- #: wpsc-admin/ajax-and-init.php:~~2102~~ wpsc-admin/ajax-and-init.php:~~2112~~
3776	msgid "Variation Price"
3777	msgstr ""
3778
3779	- #: wpsc-admin/ajax-and-init.php:~~2105~~ wpsc-admin/ajax-and-init.php:~~2116~~
3780	msgid ""
3781	"You can list a default price here for this variation. You can list a "
3782	"regular price (18.99), differential price (+1.99 / -2) or even a percentage-"
3783	"based price (+50% / -25%)."
3784	msgstr ""
3785
3786	- #: wpsc-admin/ajax-and-init.php:~~2136~~
3787	msgid "Apply to current variations?"
3788	msgstr ""
3789
3790	- #: wpsc-admin/ajax-and-init.php:~~2138~~
3791	msgid ""
3792	"By checking this box, the price rule you implement above will be applied to "
3793	"all variations that currently exist. If you leave it unchecked, it will "
	@@ -3805,55 +4271,57 @@ msgstr ""
3805	msgid "Sorry, but you cannot add zero items to your cart"
3806	msgstr ""
3807
3808	- #: wpsc-includes/ajax.functions.php:84
3809	- msgid "Sorry, but there ~~are~~ only ~~[number]~~ of this item in stock."
3810	- ~~msgstr~~ ""


3811
3812	- #: wpsc-includes/ajax.functions.php:86
3813	- msgid "Sorry, but the item \"~~[product_name]~~\" is out of stock."
3814	msgstr ""
3815
3816	- #: wpsc-includes/ajax.functions.php:~~406~~
3817	msgid "Sorry, but this variation is out of stock."
3818	msgstr ""
3819
3820	- #: wpsc-includes/ajax.functions.php:~~407~~
3821	msgid "Variation not in stock"
3822	msgstr ""
3823
3824	- #: wpsc-includes/ajax.functions.php:~~511~~
3825	msgid ""
3826	"You must select a shipping method, otherwise we cannot process your order."
3827	msgstr ""
3828
3829	- #: wpsc-includes/ajax.functions.php:~~515~~
3830	msgid ""
3831	"Please agree to the terms and conditions, otherwise we cannot process your "
3832	"order."
3833	msgstr ""
3834
3835	- #: wpsc-includes/ajax.functions.php:~~529~~
3836	msgid ""
3837	"%s cannot be shipped to %s. To continue with your transaction please remove "
3838	"this product from the list below."
3839	msgstr ""
3840
3841	- #: wpsc-includes/ajax.functions.php:~~549~~
3842	msgid "Please enter a Zipcode and click calculate to proceed"
3843	msgstr ""
3844
3845	- #: wpsc-includes/ajax.functions.php:~~938~~
3846	msgid "Invalid Image parameters"
3847	msgstr ""
3848
3849	- #: wpsc-includes/ajax.functions.php:~~967~~ wpsc-includes/ajax.functions.php:~~984~~
3850	- #: wpsc-includes/ajax.functions.php:~~1057~~
3851	msgid ""
3852	"This download is no longer valid, Please contact the site administrator for "
3853	"more information."
3854	msgstr ""
3855
3856	- #: wpsc-includes/theme.functions.php:~~175~~
3857	msgid ""
3858	"<strong>WP e-Commerce is ready</strong>. If you plan on editing the look of "
3859	"your site, you should <a href=\"%1s\">update your active theme</a> to "
	@@ -3861,7 +4329,7 @@ msgid ""
3861	"to ignore and remove this box."
3862	msgstr ""
3863
3864	- #: wpsc-includes/theme.functions.php:~~193~~
3865	msgid ""
3866	"<strong>Your WP e-Commerce data needs to be updated</strong>. You've "
3867	"upgraded from a previous version of the WP e-Commerce plugin, and your store "
	@@ -3869,7 +4337,7 @@ msgid ""
3869	"your store to continue working."
3870	msgstr ""
3871
3872	- #: wpsc-includes/theme.functions.php:~~230~~
3873	msgid ""
3874	"<strong>Store Settings</strong>: You have set 'users must register before "
3875	"checkout', for this to work you need to check 'Anyone can register' in your "
	@@ -4021,27 +4489,23 @@ msgstr ""
4021	msgid "Choose a downloadable file for this variation"
4022	msgstr ""
4023
4024	- #: wpsc-includes/processing.functions.php:~~122~~
4025	- msgid " is out of stock"
4026	msgstr ""
4027
4028	- #: wpsc-includes/processing.functions.php:~~122~~
4029	- msgid "Remaining stock of "
4030	msgstr ""
4031
4032	- #: wpsc-includes/processing.functions.php:~~122~~
4033	- msgid " is 0. Product was unpublished."
4034	- msgstr ""
4035	-
4036	- #: wpsc-includes/processing.functions.php:304
4037	msgid "This product has no available stock"
4038	msgstr ""
4039
4040	- #: wpsc-includes/processing.functions.php:~~327~~
4041	msgid "One or more of this products variations are out of stock."
4042	msgstr ""
4043
4044	- #: wpsc-includes/processing.functions.php:~~361~~
4045	msgid ""
4046	" does not support products without a weight set. Please either disable "
4047	"shipping for this product or give it a weight"
	@@ -4051,35 +4515,89 @@ msgstr ""
4051	msgid "Pages: "
4052	msgstr ""
4053
4054	- #: wpsc-includes/product-template.php:~~341~~






































4055	msgid " from %s"
4056	msgstr ""
4057
4058	- #: wpsc-includes/product-template.php:~~1396~~




4059	msgid "Avg. Customer Rating"
4060	msgstr ""
4061
4062	- #: wpsc-includes/product-template.php:~~1402~~
4063	msgid "Your Rating"
4064	msgstr ""
4065
4066	- #: wpsc-includes/product-template.php:~~1403~~
4067	msgid "Saved"
4068	msgstr ""
4069
4070	- #: wpsc-includes/product-template.php:~~1458~~
4071	msgid "Save"
4072	msgstr ""
4073
4074	- #: wpsc-includes/checkout.class.php:~~145~~
4075	- msgid "~~Tax~~"












4076	msgstr ""
4077
4078	#: wpsc-includes/purchaselogs.class.php:558
4079	msgid "Release downloads locked to this IP address %s"
4080	msgstr ""
4081
4082	- #: wpsc-includes/purchaselogs.class.php:~~756~~
4083	msgid "Thanks, the purchase log record has been deleted"
4084	msgstr ""
4085
	@@ -4087,30 +4605,30 @@ msgstr ""
4087	msgid "WP e-Commerce"
4088	msgstr ""
4089
4090	- #: wpsc-includes/display.functions.php:84
4091	msgid "People who bought this item also bought"
4092	msgstr ""
4093
4094	- #: wpsc-includes/display.functions.php:~~128~~
4095	msgid "Updating"
4096	msgstr ""
4097
4098	- #: wpsc-includes/display.functions.php:~~148~~
4099	msgid "Go to Checkout"
4100	msgstr ""
4101
4102	- #: wpsc-includes/display.functions.php:~~149~~
4103	msgid "Continue Shopping"
4104	msgstr ""
4105
4106	- #: wpsc-includes/display.functions.php:~~187~~
4107	msgid ""
4108	"You are using the example product group as your default group and it has no "
4109	"products in it, you should set the default group to something else, you can "
4110	"do so from your Shop Settings page."
4111	msgstr ""
4112
4113	- #: wpsc-includes/display.functions.php:~~189~~
4114	msgid ""
4115	"This group is set as your default product group, you should either add some "
4116	"items to it or switch your default product group to one that does contain "
	@@ -4124,33 +4642,31 @@ msgstr ""
4124	msgid "Invalid Taxonomy"
4125	msgstr ""
4126
4127	- #: wpsc-taxes/controllers/taxes_controller.class.php:~~218~~
4128	- #: wpsc-taxes/controllers/taxes_controller.class.php:~~230~~
4129	msgid "Disabled"
4130	msgstr ""
4131
4132	- #: wpsc-taxes/controllers/taxes_controller.class.php:~~235~~
4133	msgid ""
4134	"No Tax Bands Setup. Set Tax Bands up in <a href=\"options-general.php?"
4135	"page=wpsc-settings&tab=taxes\">Settings > Taxes</a>"
4136	msgstr ""
4137
4138	- #: wpsc-taxes/controllers/taxes_controller.class.php:~~239~~
4139	- msgid ""
4140	- "Product prices are Tax Exclusive. See <a href=\"options-general.php?"
4141	- "page=wpsc-settings&tab=taxes\">Settings > Taxes</a>"
4142	- msgstr ""
4143	-
4144	- #: wpsc-taxes/controllers/taxes_controller.class.php:240
4145	msgid ""
4146	"Taxes are not enabled. See <a href=\"options-general.php?page=wpsc-"
4147	"settings&tab=taxes\">Settings > Taxes</a>"
4148	msgstr ""
4149
4150	- #: wpsc-taxes/controllers/taxes_controller.class.php:~~492~~
4151	msgid "Apply to Shipping"
4152	msgstr ""
4153




4154	#: wpsc-shipping/australiapost.php:47
4155	msgid "Australia Post"
4156	msgstr ""
	@@ -4175,191 +4691,235 @@ msgstr ""
4175	msgid "Express Post International"
4176	msgstr ""
4177
4178	- #: wpsc-shipping/australiapost.php:94
4179	msgid ""
4180	"This shipping module only works if the base country in settings, region is "
4181	"set to Australia."
4182	msgstr ""
4183
4184	- #: wpsc-shipping/australiapost.php:99
4185	msgid ""
4186	"You must set your base postcode above before this shipping module will work."
4187	msgstr ""
4188
4189	- #: wpsc-shipping/australiapost.php:~~102~~
4190	msgid ""
4191	"Select the Australia Post services that you want to offer during checkout:"
4192	msgstr ""
4193
4194	- #: wpsc-shipping/australiapost.php:~~109~~
4195	msgid "Notes:"
4196	msgstr ""
4197
4198	- #: wpsc-shipping/australiapost.php:~~110~~
4199	msgid ""
4200	"1. The actual services quoted to the customer during checkout will depend on "
4201	"the destination country. Not all methods are available to all destinations."
4202	msgstr ""
4203
4204	- #: wpsc-shipping/australiapost.php:~~111~~
4205	msgid ""
4206	"2. Each product must have a valid weight configured. When editing a product, "
4207	"use the weight field.)."
4208	msgstr ""
4209
4210	- #: wpsc-shipping/australiapost.php:~~112~~
4211	msgid ""
4212	"3. To ensure accurate quotes, each product must valid dimensions configured. "
4213	"When editing a product, use the height, width and length fields."
4214	msgstr ""
4215
4216	- #: wpsc-shipping/australiapost.php:~~113~~
4217	msgid ""
4218	"4. The combined dimensions are estimated by calculating the volume of each "
4219	"item, and then calculating the cubed root of the overall order volume which "
4220	"becomes width, length and height."
4221	msgstr ""
4222
4223	- #: wpsc-shipping/australiapost.php:~~114~~
4224	msgid ""
4225	- "5. If no product ~~volumes~~ are defined, then default package dimensions of "
4226	"100mm x 100mm x 100mm will be used."
4227	msgstr ""
4228
4229	- #: wpsc-shipping/australiapost.php:~~360~~
4230	msgid "%1$s (estimated delivery time: %2$d business day)"
4231	msgid_plural "%1$s (estimated delivery time: %2$d business days)"
4232	msgstr[0] ""
4233	msgstr[1] ""
4234
4235	- #: wpsc-shipping/~~usps~~.php:56
4236	- msgid "USPS ID"
4237	- msgstr ""
4238	-
4239	- #: wpsc-shipping/usps.php:64
4240	- msgid "USPS Password"
4241	- msgstr ""
4242	-
4243	- #: wpsc-shipping/usps.php:72
4244	- msgid "Use Test Server:"
4245	- msgstr ""
4246	-
4247	- #: wpsc-shipping/usps.php:80
4248	- msgid "Select services:"
4249	- msgstr ""
4250	-
4251	- #: wpsc-shipping/usps.php:98
4252	- msgid "Add amount to rates:"
4253	- msgstr ""
4254	-
4255	- #: wpsc-shipping/ups.php:97
4256	msgid "UPS Letter"
4257	msgstr ""
4258
4259	- #: wpsc-shipping/~~ups~~.php:98
4260	msgid "Your Packaging"
4261	msgstr ""
4262
4263	- #: wpsc-shipping/~~ups~~.php:99
4264	msgid "UPS Tube"
4265	msgstr ""
4266
4267	- #: wpsc-shipping/~~ups~~.php:~~100~~
4268	msgid "UPS Pak"
4269	msgstr ""
4270
4271	- #: wpsc-shipping/~~ups~~.php:~~101~~
4272	msgid "UPS Express Box"
4273	msgstr ""
4274
4275	- #: wpsc-shipping/~~ups~~.php:~~102~~
4276	msgid "UPS Express Box - Small"
4277	msgstr ""
4278
4279	- #: wpsc-shipping/~~ups~~.php:~~103~~
4280	msgid "UPS Express Box - Medium"
4281	msgstr ""
4282
4283	- #: wpsc-shipping/~~ups~~.php:~~104~~
4284	msgid "UPS Express Box - Large"
4285	msgstr ""
4286
4287	- #: wpsc-shipping/~~ups~~.php:~~107~~
4288	msgid "Destination Type"
4289	msgstr ""
4290
4291	- #: wpsc-shipping/~~ups~~.php:~~118~~
4292	msgid "Residential Address"
4293	msgstr ""
4294
4295	- #: wpsc-shipping/~~ups~~.php:~~119~~
4296	msgid "Commercial Address"
4297	msgstr ""
4298
4299	- #: wpsc-shipping/~~ups~~.php:~~125~~
4300	msgid "Dropoff Type"
4301	msgstr ""
4302
4303	- #: wpsc-shipping/~~ups~~.php:~~159~~
4304	msgid "Customer Type"
4305	msgstr ""
4306
4307	- #: wpsc-shipping/~~ups~~.php:~~181~~
4308	msgid "Packaging"
4309	msgstr ""
4310
4311	- #: wpsc-shipping/~~ups~~.php:~~202~~
4312	msgid "Use Testing Environment"
4313	msgstr ""
4314
4315	- #: wpsc-shipping/~~ups~~.php:~~215~~
4316	msgid "Show UPS negotiated rates"
4317	msgstr ""
4318
4319	- #: wpsc-shipping/~~ups~~.php:~~224~~














4320	msgid "UPS Preferred Services"
4321	msgstr ""
4322
4323	- #: wpsc-shipping/~~ups~~.php:~~245~~
4324	msgid "All services used if no services selected"
4325	msgstr ""
4326
4327	- #: wpsc-shipping/~~ups~~.php:~~249~~
4328	msgid "UPS Account #"
4329	msgstr ""
4330
4331	- #: wpsc-shipping/~~ups~~.php:~~255~~
4332	msgid "UPS Username"
4333	msgstr ""
4334
4335	- #: wpsc-shipping/~~ups~~.php:~~261~~
4336	msgid "UPS Password"
4337	msgstr ""
4338
4339	- #: wpsc-shipping/~~ups~~.php:~~267~~
4340	msgid "UPS XML API Key"
4341	msgstr ""
4342
4343	- #: wpsc-shipping/~~ups~~.php:~~271~~
4344	msgid "Don't have an API login/ID ?"
4345	msgstr ""
4346
4347	- #: wpsc-shipping/~~ups~~.php:~~274~~




4348	msgid ""
4349	"* For Negotiated rates, you must enter a UPS account number and select "
4350	"\"Show UPS negotiated rates\" "
4351	msgstr ""
4352










































4353	#: wpsc-shipping/tablerate.php:50 wpsc-shipping/weightrate.php:49
4354	msgid "Shipping Price"
4355	msgstr ""
4356




4357	#: wpsc-shipping/weightrate.php:49
4358	msgid ""
4359	"Total weight <br />(<abbr alt=\"You must enter the weight here in pounds, "
4360	"regardless of what you used on your products\" title=\"You must enter the "
4361	"weight here in pounds, regardless of what you used on your products\">in "
4362	- "~~Pounds~~</abbr>)"
4363	msgstr ""
4364
4365	#: wpsc-shipping/flatrate.php:50
	@@ -4376,6 +4936,10 @@ msgstr ""
4376	msgid "Mauritanian Ouguiya"
4377	msgstr ""
4378




4379	#: wpsc-updates/currency_list.php:3
4380	msgid "Martinique (French)"
4381	msgstr ""
	@@ -4394,6 +4958,48 @@ msgstr ""
4394	msgid "Euro"
4395	msgstr ""
4396










































4397	#: wpsc-updates/currency_list.php:4
4398	msgid "Malta"
4399	msgstr ""
	@@ -4402,6 +5008,10 @@ msgstr ""
4402	msgid "Maltese Lira"
4403	msgstr ""
4404




4405	#: wpsc-updates/currency_list.php:5
4406	msgid "Marshall Islands"
4407	msgstr ""
	@@ -4416,6 +5026,75 @@ msgstr ""
4416	msgid "US Dollar"
4417	msgstr ""
4418





































































4419	#: wpsc-updates/currency_list.php:6
4420	msgid "Mali"
4421	msgstr ""
	@@ -4424,7 +5103,14 @@ msgstr ""
4424	#: wpsc-updates/currency_list.php:104 wpsc-updates/currency_list.php:115
4425	#: wpsc-updates/currency_list.php:159 wpsc-updates/currency_list.php:192
4426	#: wpsc-updates/currency_list.php:215
4427	- msgid "CFA Franc BCEAO"







4428	msgstr ""
4429
4430	#: wpsc-updates/currency_list.php:7
	@@ -4435,6 +5121,10 @@ msgstr ""
4435	msgid "Maldive Rufiyaa"
4436	msgstr ""
4437




4438	#: wpsc-updates/currency_list.php:8
4439	msgid "Malaysia"
4440	msgstr ""
	@@ -4443,6 +5133,10 @@ msgstr ""
4443	msgid "Malaysian Ringgit"
4444	msgstr ""
4445




4446	#: wpsc-updates/currency_list.php:9
4447	msgid "Malawi"
4448	msgstr ""
	@@ -4451,6 +5145,10 @@ msgstr ""
4451	msgid "Malawi Kwacha"
4452	msgstr ""
4453




4454	#: wpsc-updates/currency_list.php:10
4455	msgid "Madagascar"
4456	msgstr ""
	@@ -4459,6 +5157,10 @@ msgstr ""
4459	msgid "Malagasy Franc"
4460	msgstr ""
4461




4462	#: wpsc-updates/currency_list.php:11
4463	msgid "Macau"
4464	msgstr ""
	@@ -4467,6 +5169,10 @@ msgstr ""
4467	msgid "Macau Pataca"
4468	msgstr ""
4469




4470	#: wpsc-updates/currency_list.php:12
4471	msgid "Macedonia"
4472	msgstr ""
	@@ -4475,6 +5181,10 @@ msgstr ""
4475	msgid "Denar"
4476	msgstr ""
4477




4478	#: wpsc-updates/currency_list.php:13
4479	msgid "Luxembourg"
4480	msgstr ""
	@@ -4487,6 +5197,10 @@ msgstr ""
4487	msgid "Lithuanian Litas"
4488	msgstr ""
4489




4490	#: wpsc-updates/currency_list.php:15
4491	msgid "Liechtenstein"
4492	msgstr ""
	@@ -4495,6 +5209,10 @@ msgstr ""
4495	msgid "Swiss Franc"
4496	msgstr ""
4497




4498	#: wpsc-updates/currency_list.php:16
4499	msgid "Libya"
4500	msgstr ""
	@@ -4503,6 +5221,10 @@ msgstr ""
4503	msgid "Libyan Dinar"
4504	msgstr ""
4505




4506	#: wpsc-updates/currency_list.php:17
4507	msgid "Liberia"
4508	msgstr ""
	@@ -4511,6 +5233,10 @@ msgstr ""
4511	msgid "Liberian Dollar"
4512	msgstr ""
4513




4514	#: wpsc-updates/currency_list.php:18
4515	msgid "Lesotho"
4516	msgstr ""
	@@ -4519,6 +5245,10 @@ msgstr ""
4519	msgid "Lesotho Loti"
4520	msgstr ""
4521




4522	#: wpsc-updates/currency_list.php:19
4523	msgid "Lebanon"
4524	msgstr ""
	@@ -4527,6 +5257,10 @@ msgstr ""
4527	msgid "Lebanese Pound"
4528	msgstr ""
4529




4530	#: wpsc-updates/currency_list.php:20
4531	msgid "Latvia"
4532	msgstr ""
	@@ -4535,6 +5269,10 @@ msgstr ""
4535	msgid "Latvian Lats"
4536	msgstr ""
4537




4538	#: wpsc-updates/currency_list.php:21
4539	msgid "Laos"
4540	msgstr ""
	@@ -4543,6 +5281,10 @@ msgstr ""
4543	msgid "Lao Kip"
4544	msgstr ""
4545




4546	#: wpsc-updates/currency_list.php:22
4547	msgid "Kyrgyzstan"
4548	msgstr ""
	@@ -4551,6 +5293,10 @@ msgstr ""
4551	msgid "Som"
4552	msgstr ""
4553




4554	#: wpsc-updates/currency_list.php:23
4555	msgid "Kuwait"
4556	msgstr ""
	@@ -4559,6 +5305,10 @@ msgstr ""
4559	msgid "Kuwaiti Dinar"
4560	msgstr ""
4561




4562	#: wpsc-updates/currency_list.php:24
4563	msgid "Korea, South"
4564	msgstr ""
	@@ -4567,6 +5317,10 @@ msgstr ""
4567	msgid "Korean Won"
4568	msgstr ""
4569




4570	#: wpsc-updates/currency_list.php:25
4571	msgid "Korea, North"
4572	msgstr ""
	@@ -4575,6 +5329,10 @@ msgstr ""
4575	msgid "North Korean Won"
4576	msgstr ""
4577




4578	#: wpsc-updates/currency_list.php:26
4579	msgid "Kiribati"
4580	msgstr ""
	@@ -4586,6 +5344,13 @@ msgstr ""
4586	msgid "Australian Dollar"
4587	msgstr ""
4588







4589	#: wpsc-updates/currency_list.php:27
4590	msgid "Kenya"
4591	msgstr ""
	@@ -4594,6 +5359,10 @@ msgstr ""
4594	msgid "Kenyan Shilling"
4595	msgstr ""
4596




4597	#: wpsc-updates/currency_list.php:28
4598	msgid "Kazakhstan"
4599	msgstr ""
	@@ -4602,6 +5371,10 @@ msgstr ""
4602	msgid "Kazakhstan Tenge"
4603	msgstr ""
4604




4605	#: wpsc-updates/currency_list.php:29
4606	msgid "Jordan"
4607	msgstr ""
	@@ -4610,6 +5383,10 @@ msgstr ""
4610	msgid "Jordanian Dinar"
4611	msgstr ""
4612




4613	#: wpsc-updates/currency_list.php:30
4614	msgid "Jersey"
4615	msgstr ""
	@@ -4620,6 +5397,24 @@ msgstr ""
4620	msgid "Pound Sterling"
4621	msgstr ""
4622


















4623	#: wpsc-updates/currency_list.php:31
4624	msgid "Japan"
4625	msgstr ""
	@@ -4628,6 +5423,18 @@ msgstr ""
4628	msgid "Japanese Yen"
4629	msgstr ""
4630












4631	#: wpsc-updates/currency_list.php:32
4632	msgid "Jamaica"
4633	msgstr ""
	@@ -4636,6 +5443,10 @@ msgstr ""
4636	msgid "Jamaican Dollar"
4637	msgstr ""
4638




4639	#: wpsc-updates/currency_list.php:33
4640	msgid "Ivory Coast"
4641	msgstr ""
	@@ -4656,6 +5467,10 @@ msgstr ""
4656	msgid "Israeli New Shekel"
4657	msgstr ""
4658




4659	#: wpsc-updates/currency_list.php:37
4660	msgid "Ireland"
4661	msgstr ""
	@@ -4668,6 +5483,10 @@ msgstr ""
4668	msgid "Iraqi Dinar"
4669	msgstr ""
4670




4671	#: wpsc-updates/currency_list.php:39
4672	msgid "Indonesia"
4673	msgstr ""
	@@ -4676,6 +5495,10 @@ msgstr ""
4676	msgid "Indonesian Rupiah"
4677	msgstr ""
4678




4679	#: wpsc-updates/currency_list.php:40
4680	msgid "Iran"
4681	msgstr ""
	@@ -4684,6 +5507,10 @@ msgstr ""
4684	msgid "Iranian Rial"
4685	msgstr ""
4686




4687	#: wpsc-updates/currency_list.php:41
4688	msgid "India"
4689	msgstr ""
	@@ -4692,6 +5519,10 @@ msgstr ""
4692	msgid "Indian Rupee"
4693	msgstr ""
4694




4695	#: wpsc-updates/currency_list.php:42
4696	msgid "Iceland"
4697	msgstr ""
	@@ -4700,6 +5531,10 @@ msgstr ""
4700	msgid "Iceland Krona"
4701	msgstr ""
4702




4703	#: wpsc-updates/currency_list.php:43
4704	msgid "Hungary"
4705	msgstr ""
	@@ -4708,6 +5543,10 @@ msgstr ""
4708	msgid "Hungarian Forint"
4709	msgstr ""
4710




4711	#: wpsc-updates/currency_list.php:44
4712	msgid "Hong Kong"
4713	msgstr ""
	@@ -4716,6 +5555,10 @@ msgstr ""
4716	msgid "Hong Kong Dollar"
4717	msgstr ""
4718




4719	#: wpsc-updates/currency_list.php:45
4720	msgid "Honduras"
4721	msgstr ""
	@@ -4724,6 +5567,10 @@ msgstr ""
4724	msgid "Honduran Lempira"
4725	msgstr ""
4726




4727	#: wpsc-updates/currency_list.php:46
4728	msgid "Heard Island and McDonald Islands"
4729	msgstr ""
	@@ -4736,6 +5583,10 @@ msgstr ""
4736	msgid "Haitian Gourde"
4737	msgstr ""
4738




4739	#: wpsc-updates/currency_list.php:48
4740	msgid "Guyana"
4741	msgstr ""
	@@ -4744,6 +5595,10 @@ msgstr ""
4744	msgid "Guyana Dollar"
4745	msgstr ""
4746




4747	#: wpsc-updates/currency_list.php:49
4748	msgid "Guinea Bissau"
4749	msgstr ""
	@@ -4752,6 +5607,10 @@ msgstr ""
4752	msgid "Guinea-Bissau Peso"
4753	msgstr ""
4754




4755	#: wpsc-updates/currency_list.php:50
4756	msgid "Guinea"
4757	msgstr ""
	@@ -4760,6 +5619,10 @@ msgstr ""
4760	msgid "Guinea Franc"
4761	msgstr ""
4762




4763	#: wpsc-updates/currency_list.php:51
4764	msgid "Guernsey"
4765	msgstr ""
	@@ -4772,6 +5635,10 @@ msgstr ""
4772	msgid "Guatemalan Quetzal"
4773	msgstr ""
4774




4775	#: wpsc-updates/currency_list.php:53
4776	msgid "Guam (USA)"
4777	msgstr ""
	@@ -4784,6 +5651,13 @@ msgstr ""
4784	msgid "East Carribean Dollar"
4785	msgstr ""
4786







4787	#: wpsc-updates/currency_list.php:55
4788	msgid "Guadeloupe (French)"
4789	msgstr ""
	@@ -4797,6 +5671,11 @@ msgstr ""
4797	msgid "Danish Krone"
4798	msgstr ""
4799





4800	#: wpsc-updates/currency_list.php:57
4801	msgid "Greece"
4802	msgstr ""
	@@ -4809,6 +5688,10 @@ msgstr ""
4809	msgid "Gibraltar Pound"
4810	msgstr ""
4811




4812	#: wpsc-updates/currency_list.php:59
4813	msgid "Ghana"
4814	msgstr ""
	@@ -4817,6 +5700,10 @@ msgstr ""
4817	msgid "Ghanaian Cedi"
4818	msgstr ""
4819




4820	#: wpsc-updates/currency_list.php:60
4821	msgid "Germany"
4822	msgstr ""
	@@ -4829,6 +5716,10 @@ msgstr ""
4829	msgid "Georgian Lari"
4830	msgstr ""
4831




4832	#: wpsc-updates/currency_list.php:62
4833	msgid "Gambia"
4834	msgstr ""
	@@ -4837,6 +5728,10 @@ msgstr ""
4837	msgid "Gambian Dalasi"
4838	msgstr ""
4839




4840	#: wpsc-updates/currency_list.php:63
4841	msgid "Gabon"
4842	msgstr ""
	@@ -4847,6 +5742,12 @@ msgstr ""
4847	msgid "CFA Franc BEAC"
4848	msgstr ""
4849






4850	#: wpsc-updates/currency_list.php:64
4851	msgid "French Southern Territories"
4852	msgstr ""
	@@ -4867,6 +5768,10 @@ msgstr ""
4867	msgid "Fiji Dollar"
4868	msgstr ""
4869




4870	#: wpsc-updates/currency_list.php:68
4871	msgid "Faroe Islands"
4872	msgstr ""
	@@ -4879,6 +5784,10 @@ msgstr ""
4879	msgid "Falkland Islands Pound"
4880	msgstr ""
4881




4882	#: wpsc-updates/currency_list.php:70
4883	msgid "Ethiopia"
4884	msgstr ""
	@@ -4887,6 +5796,10 @@ msgstr ""
4887	msgid "Ethiopian Birr"
4888	msgstr ""
4889




4890	#: wpsc-updates/currency_list.php:71
4891	msgid "Estonia"
4892	msgstr ""
	@@ -4895,6 +5808,10 @@ msgstr ""
4895	msgid "Estonian Kroon"
4896	msgstr ""
4897




4898	#: wpsc-updates/currency_list.php:72
4899	msgid "Eritrea"
4900	msgstr ""
	@@ -4903,6 +5820,10 @@ msgstr ""
4903	msgid "Eritrean Nakfa"
4904	msgstr ""
4905




4906	#: wpsc-updates/currency_list.php:73
4907	msgid "Equatorial Guinea"
4908	msgstr ""
	@@ -4915,6 +5836,10 @@ msgstr ""
4915	msgid "El Salvador Colon"
4916	msgstr ""
4917




4918	#: wpsc-updates/currency_list.php:75
4919	msgid "Egypt"
4920	msgstr ""
	@@ -4923,6 +5848,10 @@ msgstr ""
4923	msgid "Egyptian Pound"
4924	msgstr ""
4925




4926	#: wpsc-updates/currency_list.php:76
4927	msgid "Ecuador"
4928	msgstr ""
	@@ -4931,6 +5860,10 @@ msgstr ""
4931	msgid "Ecuador Sucre"
4932	msgstr ""
4933




4934	#: wpsc-updates/currency_list.php:77
4935	msgid "East Timor"
4936	msgstr ""
	@@ -4939,6 +5872,10 @@ msgstr ""
4939	msgid "Timor Escudo"
4940	msgstr ""
4941




4942	#: wpsc-updates/currency_list.php:78
4943	msgid "Dominican Republic"
4944	msgstr ""
	@@ -4947,6 +5884,10 @@ msgstr ""
4947	msgid "Dominican Peso"
4948	msgstr ""
4949




4950	#: wpsc-updates/currency_list.php:79
4951	msgid "Dominica"
4952	msgstr ""
	@@ -4966,6 +5907,10 @@ msgstr ""
4966	msgid "Djibouti Franc"
4967	msgstr ""
4968




4969	#: wpsc-updates/currency_list.php:81
4970	msgid "Denmark"
4971	msgstr ""
	@@ -4978,6 +5923,10 @@ msgstr ""
4978	msgid "Francs"
4979	msgstr ""
4980




4981	#: wpsc-updates/currency_list.php:83
4982	msgid "Czech Rep."
4983	msgstr ""
	@@ -4986,6 +5935,10 @@ msgstr ""
4986	msgid "Czech Koruna"
4987	msgstr ""
4988




4989	#: wpsc-updates/currency_list.php:84
4990	msgid "Cyprus"
4991	msgstr ""
	@@ -4994,6 +5947,10 @@ msgstr ""
4994	msgid "Cyprus Pound"
4995	msgstr ""
4996




4997	#: wpsc-updates/currency_list.php:85
4998	msgid "Cuba"
4999	msgstr ""
	@@ -5002,6 +5959,10 @@ msgstr ""
5002	msgid "Cuban Peso"
5003	msgstr ""
5004




5005	#: wpsc-updates/currency_list.php:86
5006	msgid "Croatia"
5007	msgstr ""
	@@ -5010,6 +5971,10 @@ msgstr ""
5010	msgid "Croatian Kuna"
5011	msgstr ""
5012




5013	#: wpsc-updates/currency_list.php:87
5014	msgid "Costa Rica"
5015	msgstr ""
	@@ -5018,6 +5983,10 @@ msgstr ""
5018	msgid "Costa Rican Colon"
5019	msgstr ""
5020




5021	#: wpsc-updates/currency_list.php:88
5022	msgid "Cook Islands"
5023	msgstr ""
	@@ -5028,6 +5997,12 @@ msgstr ""
5028	msgid "New Zealand Dollar"
5029	msgstr ""
5030






5031	#: wpsc-updates/currency_list.php:89
5032	msgid "Congo"
5033	msgstr ""
	@@ -5040,6 +6015,10 @@ msgstr ""
5040	msgid "Comoros Franc"
5041	msgstr ""
5042




5043	#: wpsc-updates/currency_list.php:91
5044	msgid "Colombia"
5045	msgstr ""
	@@ -5048,6 +6027,10 @@ msgstr ""
5048	msgid "Colombian Peso"
5049	msgstr ""
5050




5051	#: wpsc-updates/currency_list.php:92
5052	msgid "Cocos (Keeling) Islands"
5053	msgstr ""
	@@ -5064,6 +6047,10 @@ msgstr ""
5064	msgid "Chilean Peso"
5065	msgstr ""
5066




5067	#: wpsc-updates/currency_list.php:95
5068	msgid "China"
5069	msgstr ""
	@@ -5072,6 +6059,10 @@ msgstr ""
5072	msgid "Yuan Renminbi"
5073	msgstr ""
5074




5075	#: wpsc-updates/currency_list.php:96
5076	msgid "Chad"
5077	msgstr ""
	@@ -5088,6 +6079,10 @@ msgstr ""
5088	msgid "Cayman Islands Dollar"
5089	msgstr ""
5090




5091	#: wpsc-updates/currency_list.php:99
5092	msgid "Cape Verde"
5093	msgstr ""
	@@ -5096,6 +6091,10 @@ msgstr ""
5096	msgid "Cape Verde Escudo"
5097	msgstr ""
5098




5099	#: wpsc-updates/currency_list.php:100
5100	msgid "Cameroon"
5101	msgstr ""
	@@ -5108,6 +6107,10 @@ msgstr ""
5108	msgid "Canadian Dollar"
5109	msgstr ""
5110




5111	#: wpsc-updates/currency_list.php:102
5112	msgid "Cambodia"
5113	msgstr ""
	@@ -5116,6 +6119,10 @@ msgstr ""
5116	msgid "Kampuchean Riel"
5117	msgstr ""
5118




5119	#: wpsc-updates/currency_list.php:103
5120	msgid "Burundi"
5121	msgstr ""
	@@ -5124,6 +6131,10 @@ msgstr ""
5124	msgid "Burundi Franc"
5125	msgstr ""
5126




5127	#: wpsc-updates/currency_list.php:104
5128	msgid "Burkina Faso"
5129	msgstr ""
	@@ -5136,6 +6147,10 @@ msgstr ""
5136	msgid "Bulgarian Lev"
5137	msgstr ""
5138




5139	#: wpsc-updates/currency_list.php:106
5140	msgid "Brunei Darussalam"
5141	msgstr ""
	@@ -5144,6 +6159,10 @@ msgstr ""
5144	msgid "Brunei Dollar"
5145	msgstr ""
5146




5147	#: wpsc-updates/currency_list.php:107
5148	msgid "British Indian Ocean Territory"
5149	msgstr ""
	@@ -5153,7 +6172,11 @@ msgid "Brazil"
5153	msgstr ""
5154
5155	#: wpsc-updates/currency_list.php:108
5156	- msgid "Brazilian Real"




5157	msgstr ""
5158
5159	#: wpsc-updates/currency_list.php:109
	@@ -5165,6 +6188,11 @@ msgstr ""
5165	msgid "Norwegian Krone"
5166	msgstr ""
5167





5168	#: wpsc-updates/currency_list.php:110
5169	msgid "Botswana"
5170	msgstr ""
	@@ -5173,6 +6201,10 @@ msgstr ""
5173	msgid "Botswana Pula"
5174	msgstr ""
5175




5176	#: wpsc-updates/currency_list.php:111
5177	msgid "Bosnia-Herzegovina"
5178	msgstr ""
	@@ -5181,6 +6213,10 @@ msgstr ""
5181	msgid "Marka"
5182	msgstr ""
5183




5184	#: wpsc-updates/currency_list.php:112
5185	msgid "Bolivia"
5186	msgstr ""
	@@ -5189,6 +6225,10 @@ msgstr ""
5189	msgid "Boliviano"
5190	msgstr ""
5191




5192	#: wpsc-updates/currency_list.php:113
5193	msgid "Bhutan"
5194	msgstr ""
	@@ -5197,6 +6237,10 @@ msgstr ""
5197	msgid "Bhutan Ngultrum"
5198	msgstr ""
5199




5200	#: wpsc-updates/currency_list.php:114
5201	msgid "Bermuda"
5202	msgstr ""
	@@ -5205,6 +6249,10 @@ msgstr ""
5205	msgid "Bermudian Dollar"
5206	msgstr ""
5207




5208	#: wpsc-updates/currency_list.php:115
5209	msgid "Benin"
5210	msgstr ""
	@@ -5217,6 +6265,10 @@ msgstr ""
5217	msgid "Belize Dollar"
5218	msgstr ""
5219




5220	#: wpsc-updates/currency_list.php:117
5221	msgid "Belgium"
5222	msgstr ""
	@@ -5229,6 +6281,10 @@ msgstr ""
5229	msgid "Belarussian Ruble"
5230	msgstr ""
5231




5232	#: wpsc-updates/currency_list.php:119
5233	msgid "Barbados"
5234	msgstr ""
	@@ -5237,6 +6293,10 @@ msgstr ""
5237	msgid "Barbados Dollar"
5238	msgstr ""
5239




5240	#: wpsc-updates/currency_list.php:120
5241	msgid "Bangladesh"
5242	msgstr ""
	@@ -5245,6 +6305,10 @@ msgstr ""
5245	msgid "Bangladeshi Taka"
5246	msgstr ""
5247




5248	#: wpsc-updates/currency_list.php:121
5249	msgid "Bahrain"
5250	msgstr ""
	@@ -5253,6 +6317,10 @@ msgstr ""
5253	msgid "Bahraini Dinar"
5254	msgstr ""
5255




5256	#: wpsc-updates/currency_list.php:122
5257	msgid "Bahamas"
5258	msgstr ""
	@@ -5261,6 +6329,10 @@ msgstr ""
5261	msgid "Bahamian Dollar"
5262	msgstr ""
5263




5264	#: wpsc-updates/currency_list.php:123
5265	msgid "Azerbaijan"
5266	msgstr ""
	@@ -5269,6 +6341,10 @@ msgstr ""
5269	msgid "Azerbaijanian Manat"
5270	msgstr ""
5271




5272	#: wpsc-updates/currency_list.php:124
5273	msgid "Austria"
5274	msgstr ""
	@@ -5281,6 +6357,10 @@ msgstr ""
5281	msgid "Aruban Guilder"
5282	msgstr ""
5283




5284	#: wpsc-updates/currency_list.php:126
5285	msgid "Armenia"
5286	msgstr ""
	@@ -5289,6 +6369,10 @@ msgstr ""
5289	msgid "Armenian Dram"
5290	msgstr ""
5291




5292	#: wpsc-updates/currency_list.php:127
5293	msgid "Argentina"
5294	msgstr ""
	@@ -5297,6 +6381,10 @@ msgstr ""
5297	msgid "Argentine Peso"
5298	msgstr ""
5299




5300	#: wpsc-updates/currency_list.php:128
5301	msgid "Antigua and Barbuda"
5302	msgstr ""
	@@ -5309,6 +6397,10 @@ msgstr ""
5309	msgid "Dollar"
5310	msgstr ""
5311




5312	#: wpsc-updates/currency_list.php:130
5313	msgid "Anguilla"
5314	msgstr ""
	@@ -5321,6 +6413,10 @@ msgstr ""
5321	msgid "Angolan New Kwanza"
5322	msgstr ""
5323




5324	#: wpsc-updates/currency_list.php:132
5325	msgid "Andorra"
5326	msgstr ""
	@@ -5337,6 +6433,10 @@ msgstr ""
5337	msgid "Algerian Dinar"
5338	msgstr ""
5339




5340	#: wpsc-updates/currency_list.php:135
5341	msgid "Albania"
5342	msgstr ""
	@@ -5345,6 +6445,10 @@ msgstr ""
5345	msgid "Albanian Lek"
5346	msgstr ""
5347




5348	#: wpsc-updates/currency_list.php:136
5349	msgid "Afghanistan"
5350	msgstr ""
	@@ -5353,6 +6457,10 @@ msgstr ""
5353	msgid "Afghanistan Afghani"
5354	msgstr ""
5355




5356	#: wpsc-updates/currency_list.php:137
5357	msgid "USA"
5358	msgstr ""
	@@ -5373,6 +6481,10 @@ msgstr ""
5373	msgid "Mauritius Rupee"
5374	msgstr ""
5375




5376	#: wpsc-updates/currency_list.php:141
5377	msgid "Mayotte"
5378	msgstr ""
	@@ -5385,6 +6497,10 @@ msgstr ""
5385	msgid "Mexican Nuevo Peso"
5386	msgstr ""
5387




5388	#: wpsc-updates/currency_list.php:143
5389	msgid "Micronesia"
5390	msgstr ""
	@@ -5397,6 +6513,10 @@ msgstr ""
5397	msgid "Moldovan Leu"
5398	msgstr ""
5399




5400	#: wpsc-updates/currency_list.php:145
5401	msgid "Monaco"
5402	msgstr ""
	@@ -5409,6 +6529,10 @@ msgstr ""
5409	msgid "Mongolian Tugrik"
5410	msgstr ""
5411




5412	#: wpsc-updates/currency_list.php:147
5413	msgid "Montserrat"
5414	msgstr ""
	@@ -5421,6 +6545,10 @@ msgstr ""
5421	msgid "Moroccan Dirham"
5422	msgstr ""
5423




5424	#: wpsc-updates/currency_list.php:149
5425	msgid "Mozambique"
5426	msgstr ""
	@@ -5429,6 +6557,10 @@ msgstr ""
5429	msgid "Mozambique Metical"
5430	msgstr ""
5431




5432	#: wpsc-updates/currency_list.php:150
5433	msgid "Myanmar"
5434	msgstr ""
	@@ -5437,6 +6569,10 @@ msgstr ""
5437	msgid "Myanmar Kyat"
5438	msgstr ""
5439




5440	#: wpsc-updates/currency_list.php:151
5441	msgid "Namibia"
5442	msgstr ""
	@@ -5445,6 +6581,10 @@ msgstr ""
5445	msgid "Namibian Dollar"
5446	msgstr ""
5447




5448	#: wpsc-updates/currency_list.php:152
5449	msgid "Nauru"
5450	msgstr ""
	@@ -5457,6 +6597,10 @@ msgstr ""
5457	msgid "Nepalese Rupee"
5458	msgstr ""
5459




5460	#: wpsc-updates/currency_list.php:154
5461	msgid "Netherlands"
5462	msgstr ""
	@@ -5469,6 +6613,10 @@ msgstr ""
5469	msgid "Netherlands Antillean Guilder"
5470	msgstr ""
5471




5472	#: wpsc-updates/currency_list.php:156
5473	msgid "New Caledonia (French)"
5474	msgstr ""
	@@ -5478,6 +6626,11 @@ msgstr ""
5478	msgid "CFP Franc"
5479	msgstr ""
5480





5481	#: wpsc-updates/currency_list.php:157
5482	msgid "New Zealand"
5483	msgstr ""
	@@ -5490,6 +6643,10 @@ msgstr ""
5490	msgid "Nicaraguan Cordoba Oro"
5491	msgstr ""
5492




5493	#: wpsc-updates/currency_list.php:159
5494	msgid "Niger"
5495	msgstr ""
	@@ -5502,6 +6659,10 @@ msgstr ""
5502	msgid "Nigerian Naira"
5503	msgstr ""
5504




5505	#: wpsc-updates/currency_list.php:161
5506	msgid "Niue"
5507	msgstr ""
	@@ -5526,6 +6687,10 @@ msgstr ""
5526	msgid "Omani Rial"
5527	msgstr ""
5528




5529	#: wpsc-updates/currency_list.php:166
5530	msgid "Pakistan"
5531	msgstr ""
	@@ -5534,6 +6699,10 @@ msgstr ""
5534	msgid "Pakistan Rupee"
5535	msgstr ""
5536




5537	#: wpsc-updates/currency_list.php:167
5538	msgid "Palau"
5539	msgstr ""
	@@ -5546,6 +6715,10 @@ msgstr ""
5546	msgid "Panamanian Balboa"
5547	msgstr ""
5548




5549	#: wpsc-updates/currency_list.php:169
5550	msgid "Papua New Guinea"
5551	msgstr ""
	@@ -5554,6 +6727,10 @@ msgstr ""
5554	msgid "Papua New Guinea Kina"
5555	msgstr ""
5556




5557	#: wpsc-updates/currency_list.php:170
5558	msgid "Paraguay"
5559	msgstr ""
	@@ -5562,6 +6739,10 @@ msgstr ""
5562	msgid "Paraguay Guarani"
5563	msgstr ""
5564




5565	#: wpsc-updates/currency_list.php:171
5566	msgid "Peru"
5567	msgstr ""
	@@ -5570,6 +6751,10 @@ msgstr ""
5570	msgid "Peruvian Nuevo Sol"
5571	msgstr ""
5572




5573	#: wpsc-updates/currency_list.php:172
5574	msgid "Philippines"
5575	msgstr ""
	@@ -5578,6 +6763,10 @@ msgstr ""
5578	msgid "Philippine Peso"
5579	msgstr ""
5580




5581	#: wpsc-updates/currency_list.php:173
5582	msgid "Pitcairn Island"
5583	msgstr ""
	@@ -5590,6 +6779,10 @@ msgstr ""
5590	msgid "Polish Zloty"
5591	msgstr ""
5592




5593	#: wpsc-updates/currency_list.php:175
5594	msgid "Polynesia (French)"
5595	msgstr ""
	@@ -5610,6 +6803,10 @@ msgstr ""
5610	msgid "Qatari Rial"
5611	msgstr ""
5612




5613	#: wpsc-updates/currency_list.php:179
5614	msgid "Reunion (French)"
5615	msgstr ""
	@@ -5622,6 +6819,10 @@ msgstr ""
5622	msgid "Romanian Leu"
5623	msgstr ""
5624




5625	#: wpsc-updates/currency_list.php:181
5626	msgid "Russia"
5627	msgstr ""
	@@ -5630,6 +6831,10 @@ msgstr ""
5630	msgid "Russian Ruble"
5631	msgstr ""
5632




5633	#: wpsc-updates/currency_list.php:182
5634	msgid "Rwanda"
5635	msgstr ""
	@@ -5638,6 +6843,10 @@ msgstr ""
5638	msgid "Rwanda Franc"
5639	msgstr ""
5640




5641	#: wpsc-updates/currency_list.php:183
5642	msgid "Saint Helena"
5643	msgstr ""
	@@ -5646,6 +6855,10 @@ msgstr ""
5646	msgid "St. Helena Pound"
5647	msgstr ""
5648




5649	#: wpsc-updates/currency_list.php:184
5650	msgid "Saint Kitts & Nevis Anguilla"
5651	msgstr ""
	@@ -5670,6 +6883,10 @@ msgstr ""
5670	msgid "Samoan Tala"
5671	msgstr ""
5672




5673	#: wpsc-updates/currency_list.php:189
5674	msgid "San Marino"
5675	msgstr ""
	@@ -5678,6 +6895,10 @@ msgstr ""
5678	msgid "Italian Lira"
5679	msgstr ""
5680




5681	#: wpsc-updates/currency_list.php:190
5682	msgid "Sao Tome and Principe"
5683	msgstr ""
	@@ -5686,6 +6907,10 @@ msgstr ""
5686	msgid "Dobra"
5687	msgstr ""
5688




5689	#: wpsc-updates/currency_list.php:191
5690	msgid "Saudi Arabia"
5691	msgstr ""
	@@ -5694,6 +6919,10 @@ msgstr ""
5694	msgid "Saudi Riyal"
5695	msgstr ""
5696




5697	#: wpsc-updates/currency_list.php:192
5698	msgid "Senegal"
5699	msgstr ""
	@@ -5706,6 +6935,10 @@ msgstr ""
5706	msgid "Seychelles Rupee"
5707	msgstr ""
5708




5709	#: wpsc-updates/currency_list.php:194
5710	msgid "Sierra Leone"
5711	msgstr ""
	@@ -5714,6 +6947,10 @@ msgstr ""
5714	msgid "Sierra Leone Leone"
5715	msgstr ""
5716




5717	#: wpsc-updates/currency_list.php:195
5718	msgid "Singapore"
5719	msgstr ""
	@@ -5722,6 +6959,10 @@ msgstr ""
5722	msgid "Singapore Dollar"
5723	msgstr ""
5724




5725	#: wpsc-updates/currency_list.php:196
5726	msgid "Slovakia"
5727	msgstr ""
	@@ -5734,6 +6975,10 @@ msgstr ""
5734	msgid "Slovenian Tolar"
5735	msgstr ""
5736




5737	#: wpsc-updates/currency_list.php:198
5738	msgid "Solomon Islands"
5739	msgstr ""
	@@ -5750,6 +6995,10 @@ msgstr ""
5750	msgid "Somali Shilling"
5751	msgstr ""
5752




5753	#: wpsc-updates/currency_list.php:200
5754	msgid "South Africa"
5755	msgstr ""
	@@ -5758,6 +7007,10 @@ msgstr ""
5758	msgid "South African Rand"
5759	msgstr ""
5760




5761	#: wpsc-updates/currency_list.php:201
5762	msgid "South Georgia & South Sandwich Islands"
5763	msgstr ""
	@@ -5774,6 +7027,10 @@ msgstr ""
5774	msgid "Sri Lanka Rupee"
5775	msgstr ""
5776




5777	#: wpsc-updates/currency_list.php:204
5778	msgid "Sudan"
5779	msgstr ""
	@@ -5782,6 +7039,10 @@ msgstr ""
5782	msgid "Sudanese Dinar"
5783	msgstr ""
5784




5785	#: wpsc-updates/currency_list.php:205
5786	msgid "Suriname"
5787	msgstr ""
	@@ -5790,6 +7051,10 @@ msgstr ""
5790	msgid "Surinam Guilder"
5791	msgstr ""
5792




5793	#: wpsc-updates/currency_list.php:206
5794	msgid "Svalbard and Jan Mayen Islands"
5795	msgstr ""
	@@ -5802,6 +7067,10 @@ msgstr ""
5802	msgid "Swaziland Lilangeni"
5803	msgstr ""
5804




5805	#: wpsc-updates/currency_list.php:208
5806	msgid "Sweden"
5807	msgstr ""
	@@ -5810,6 +7079,10 @@ msgstr ""
5810	msgid "Swedish Krona"
5811	msgstr ""
5812




5813	#: wpsc-updates/currency_list.php:209
5814	msgid "Switzerland"
5815	msgstr ""
	@@ -5822,6 +7095,10 @@ msgstr ""
5822	msgid "Syrian Pound"
5823	msgstr ""
5824




5825	#: wpsc-updates/currency_list.php:211
5826	msgid "Taiwan"
5827	msgstr ""
	@@ -5830,6 +7107,10 @@ msgstr ""
5830	msgid "Taiwan Dollar"
5831	msgstr ""
5832




5833	#: wpsc-updates/currency_list.php:212
5834	msgid "Tajikistan"
5835	msgstr ""
	@@ -5838,6 +7119,10 @@ msgstr ""
5838	msgid "Tajik Ruble"
5839	msgstr ""
5840




5841	#: wpsc-updates/currency_list.php:213
5842	msgid "Tanzania"
5843	msgstr ""
	@@ -5846,6 +7131,10 @@ msgstr ""
5846	msgid "Tanzanian Shilling"
5847	msgstr ""
5848




5849	#: wpsc-updates/currency_list.php:214
5850	msgid "Thailand"
5851	msgstr ""
	@@ -5854,6 +7143,10 @@ msgstr ""
5854	msgid "Thai Baht"
5855	msgstr ""
5856




5857	#: wpsc-updates/currency_list.php:215
5858	msgid "Togo"
5859	msgstr ""
	@@ -5870,6 +7163,10 @@ msgstr ""
5870	msgid "Tongan Paʻanga"
5871	msgstr ""
5872




5873	#: wpsc-updates/currency_list.php:218
5874	msgid "Trinidad and Tobago"
5875	msgstr ""
	@@ -5878,6 +7175,10 @@ msgstr ""
5878	msgid "Trinidad and Tobago Dollar"
5879	msgstr ""
5880




5881	#: wpsc-updates/currency_list.php:219
5882	msgid "Tunisia"
5883	msgstr ""
	@@ -5886,6 +7187,10 @@ msgstr ""
5886	msgid "Tunisian Dollar"
5887	msgstr ""
5888




5889	#: wpsc-updates/currency_list.php:220
5890	msgid "Turkey"
5891	msgstr ""
	@@ -5894,6 +7199,10 @@ msgstr ""
5894	msgid "Turkish Lira"
5895	msgstr ""
5896




5897	#: wpsc-updates/currency_list.php:221
5898	msgid "Turkmenistan"
5899	msgstr ""
	@@ -5902,6 +7211,10 @@ msgstr ""
5902	msgid "Manat"
5903	msgstr ""
5904




5905	#: wpsc-updates/currency_list.php:222
5906	msgid "Turks and Caicos Islands"
5907	msgstr ""
	@@ -5922,6 +7235,10 @@ msgstr ""
5922	msgid "Uganda Shilling"
5923	msgstr ""
5924




5925	#: wpsc-updates/currency_list.php:226
5926	msgid "Ukraine"
5927	msgstr ""
	@@ -5930,6 +7247,10 @@ msgstr ""
5930	msgid "Ukraine Hryvnia"
5931	msgstr ""
5932




5933	#: wpsc-updates/currency_list.php:227
5934	msgid "United Arab Emirates"
5935	msgstr ""
	@@ -5938,6 +7259,10 @@ msgstr ""
5938	msgid "Arab Emirates Dirham"
5939	msgstr ""
5940




5941	#: wpsc-updates/currency_list.php:228
5942	msgid "Uruguay"
5943	msgstr ""
	@@ -5946,6 +7271,10 @@ msgstr ""
5946	msgid "Uruguayan Peso"
5947	msgstr ""
5948




5949	#: wpsc-updates/currency_list.php:229
5950	msgid "USA Minor Outlying Islands"
5951	msgstr ""
	@@ -5958,6 +7287,10 @@ msgstr ""
5958	msgid "Uzbekistan Sum"
5959	msgstr ""
5960




5961	#: wpsc-updates/currency_list.php:231
5962	msgid "Vanuatu"
5963	msgstr ""
	@@ -5966,6 +7299,10 @@ msgstr ""
5966	msgid "Vanuatu Vatu"
5967	msgstr ""
5968




5969	#: wpsc-updates/currency_list.php:232
5970	msgid "Vatican"
5971	msgstr ""
	@@ -5978,6 +7315,10 @@ msgstr ""
5978	msgid "Venezuelan Bolivar"
5979	msgstr ""
5980




5981	#: wpsc-updates/currency_list.php:234
5982	msgid "Vietnam"
5983	msgstr ""
	@@ -5986,6 +7327,10 @@ msgstr ""
5986	msgid "Vietnamese Dong"
5987	msgstr ""
5988




5989	#: wpsc-updates/currency_list.php:235
5990	msgid "Virgin Islands (British)"
5991	msgstr ""
	@@ -6010,6 +7355,10 @@ msgstr ""
6010	msgid "Yemeni Rial"
6011	msgstr ""
6012




6013	#: wpsc-updates/currency_list.php:240
6014	msgid "Yugoslavia"
6015	msgstr ""
	@@ -6018,6 +7367,10 @@ msgstr ""
6018	msgid "Yugoslav New Dinar"
6019	msgstr ""
6020




6021	#: wpsc-updates/currency_list.php:241
6022	msgid "Zambia"
6023	msgstr ""
	@@ -6026,6 +7379,10 @@ msgstr ""
6026	msgid "Zambian Kwacha"
6027	msgstr ""
6028




6029	#: wpsc-updates/currency_list.php:242
6030	msgid "Zimbabwe"
6031	msgstr ""
	@@ -6034,6 +7391,10 @@ msgstr ""
6034	msgid "Zimbabwe Dollar"
6035	msgstr ""
6036




6037	#: wpsc-updates/updating_tasks.php:4
6038	msgid ""
6039	"Your purchase from %shop_name% has just been dispatched. It should arrive "


4	msgstr ""
5	"Project-Id-Version: \n"
6	"Report-Msgid-Bugs-To: http://wordpress.org/tag/wp-e-commerce\n"
7	+ "POT-Creation-Date: 2011-02-24 23:04:41+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"

12	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13	"Language-Team: LANGUAGE <LL@li.org>\n"
14
15	+ #: wpsc-theme/wpsc-list_view.php:81 wpsc-theme/wpsc-single_product.php:130
16	+ #: wpsc-theme/wpsc-products_page.php:166 wpsc-includes/ajax.functions.php:411
17	msgid "Product in stock"
18	msgstr ""
19
20	+ #: wpsc-theme/wpsc-list_view.php:83 wpsc-theme/wpsc-single_product.php:132
21	#: wpsc-theme/wpsc-products_page.php:168
22	msgid "Product not in stock"
23	msgstr ""
24
25	+ #: wpsc-theme/wpsc-list_view.php:108 wpsc-theme/wpsc-single_product.php:119
26	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:471
27	#: wpsc-theme/wpsc-products_page.php:153
28	#: wpsc-theme/wpsc-shopping_cart_page.php:19
29	+ #: wpsc-admin/admin-form-functions.php:399
30	#: wpsc-admin/display-sales-logs.php:136
31	+ #: wpsc-includes/display.functions.php:44
32	msgid "Quantity"
33	msgstr ""
34
35	+ #: wpsc-theme/wpsc-list_view.php:122 wpsc-theme/wpsc-single_product.php:177
36	#: wpsc-theme/wpsc-products_page.php:208
37	+ #: wpsc-admin/includes/settings-pages/presentation.php:254
38	+ #: wpsc-includes/product-template.php:689
39	+ #: wpsc-includes/display.functions.php:182
40	msgid "Buy Now"
41	msgstr ""
42
43	+ #: wpsc-theme/wpsc-list_view.php:124 wpsc-theme/wpsc-single_product.php:179
44	#: wpsc-theme/wpsc-grid_view.php:129 wpsc-theme/wpsc-products_page.php:210
45	#: wpsc-widgets/donations_widget.php:165
46	+ #: wpsc-admin/includes/settings-pages/presentation.php:245
47	+ #: wpsc-includes/display.functions.php:270
48	msgid "Add To Cart"
49	msgstr ""
50
51	+ #: wpsc-theme/wpsc-list_view.php:128 wpsc-theme/wpsc-single_product.php:183
52	#: wpsc-theme/wpsc-grid_view.php:138 wpsc-theme/wpsc-products_page.php:204
53	msgid "Updating cart..."
54	msgstr ""
55
56	+ #: wpsc-theme/wpsc-list_view.php:132 wpsc-theme/wpsc-single_product.php:187
57	msgid "This product has sold out."
58	msgstr ""
59
60	#: wpsc-theme/wpsc-list_view.php:145 wpsc-theme/wpsc-grid_view.php:158
61	+ #: wpsc-theme/wpsc-products_page.php:235
62	msgid "There are no products in this group."
63	msgstr ""
64

72	msgid "Please visit our shop"
73	msgstr ""
74
75	+ #: wpsc-theme/wpsc-single_product.php:79
76	msgid "Personalize Your Product"
77	msgstr ""
78
79	+ #: wpsc-theme/wpsc-single_product.php:80
80	msgid ""
81	"Complete this form to include a personalized message with your purchase."
82	msgstr ""
83
84	+ #: wpsc-theme/wpsc-single_product.php:88
85	msgid "Upload a File"
86	msgstr ""
87
88	+ #: wpsc-theme/wpsc-single_product.php:89
89	msgid "Select a file from your computer to include with this purchase."
90	msgstr ""
91
92	+ #: wpsc-theme/wpsc-single_product.php:95 wpsc-theme/wpsc-grid_view.php:109
93	#: wpsc-theme/wpsc-products_page.php:133
94	msgid "Product Options"
95	msgstr ""
96
97	+ #: wpsc-theme/wpsc-single_product.php:136
98	#: wpsc-theme/wpsc-products_page.php:172 wpsc-widgets/donations_widget.php:164
99	msgid "Donation"
100	msgstr ""
101
102	+ #: wpsc-theme/wpsc-single_product.php:140 wpsc-theme/wpsc-grid_view.php:89
103	+ #: wpsc-theme/wpsc-products_page.php:177
104	+ msgid "Old Price"
105	+ msgstr ""
106	+
107	+ #: wpsc-theme/wpsc-single_product.php:142
108	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:475
109	+ #: wpsc-theme/wpsc-grid_view.php:91 wpsc-theme/wpsc-products_page.php:179
110	+ #: wpsc-theme/wpsc-user-log.php:104 wpsc-theme/wpsc-cart_widget.php:14
111	#: wpsc-theme/wpsc-shopping_cart_page.php:20
112	+ #: wpsc-admin/includes/settings-pages/presentation.php:595
113	+ #: wpsc-admin/includes/settings-pages/import.php:81
114	+ #: wpsc-admin/includes/display-items-functions.php:137
115	+ #: wpsc-admin/includes/display-items-functions.php:162
116	+ #: wpsc-admin/includes/products.php:78 wpsc-admin/display-items.page.php:47
117	+ #: wpsc-admin/display-items.page.php:60 wpsc-admin/display-items.page.php:76
118	+ #: wpsc-admin/admin-form-functions.php:404
119	#: wpsc-admin/display-sales-logs.php:137
120	msgid "Price"
121	msgstr ""
122
123	+ #: wpsc-theme/wpsc-single_product.php:144
124	#: wpsc-theme/wpsc-products_page.php:181
125	msgid "You save"
126	msgstr ""
127
128	+ #: wpsc-theme/wpsc-single_product.php:151
129	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:483


130	#: wpsc-theme/wpsc-grid_view.php:93 wpsc-theme/wpsc-products_page.php:190
131	+ #: wpsc-theme/wpsc-cart_widget.php:38 wpsc-admin/admin.php:309
132	+ #: wpsc-admin/admin-form-functions.php:406
133	#: wpsc-admin/display-sales-logs.php:138 wpsc-admin/display-sales-logs.php:228


134	msgid "Shipping"
135	msgstr ""
136
137	#: wpsc-theme/functions/wpsc-user_log_functions.php:65
138	+ #: wpsc-core/wpsc-installer.php:745 wpsc-core/wpsc-installer.php:754
139	msgid "First Name"
140	msgstr ""
141

144	msgstr ""
145
146	#: wpsc-theme/functions/wpsc-user_log_functions.php:69
147	+ #: wpsc-core/wpsc-installer.php:746 wpsc-core/wpsc-installer.php:755
148	msgid "Last Name"
149	msgstr ""
150

153	msgstr ""
154
155	#: wpsc-theme/functions/wpsc-user_log_functions.php:73
156	+ #: wpsc-core/wpsc-installer.php:752 wpsc-admin/admin.php:398
157	+ #: wpsc-admin/admin-form-functions.php:373
158	msgid "Email"
159	msgstr ""
160

175	msgstr ""
176
177	#: wpsc-theme/functions/wpsc-user_log_functions.php:82
178	+ #: wpsc-core/wpsc-installer.php:748 wpsc-core/wpsc-installer.php:757
179	msgid "City"
180	msgstr ""
181

184	msgstr ""
185
186	#: wpsc-theme/functions/wpsc-user_log_functions.php:86
187	+ #: wpsc-core/wpsc-installer.php:763 wpsc-admin/admin-form-functions.php:372
188	msgid "Phone"
189	msgstr ""
190

193	msgstr ""
194
195	#: wpsc-theme/functions/wpsc-user_log_functions.php:90
196	+ #: wpsc-core/wpsc-installer.php:750 wpsc-core/wpsc-installer.php:759
197	+ #: wpsc-admin/admin.php:399
198	msgid "Country"
199	msgstr ""
200

203	msgstr ""
204
205	#: wpsc-theme/functions/wpsc-user_log_functions.php:95



206	msgid "Please enter a valid"
207	msgstr ""
208

210	msgid "Thanks, your changes have been saved."
211	msgstr ""
212
213	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:371
214	+ #: wpsc-admin/display-sales-logs.php:53
215	msgid "Details"
216	msgstr ""
217
218	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:420
219	msgid "Order Status"
220	msgstr ""
221
222	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:440
223	+ #: wpsc-core/wpsc-installer.php:753
224	+ #: wpsc-admin/includes/purchlogs_upgrade.php:47
225	#: wpsc-admin/display-sales-logs.php:153
226	+ msgid "Shipping Address"
227	msgstr ""
228
229	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:457
230	msgid "Order Details"
231	msgstr ""
232
233	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:467
234	+ #: wpsc-admin/includes/settings-pages/presentation.php:593
235	+ #: wpsc-admin/includes/settings-pages/checkout.php:10
236	+ #: wpsc-admin/includes/display-items-functions.php:695
237	+ #: wpsc-admin/includes/display-items-functions.php:706
238	+ #: wpsc-admin/includes/products.php:78 wpsc-admin/display-items.page.php:44
239	+ #: wpsc-admin/display-items.page.php:73
240	+ #: wpsc-admin/admin-form-functions.php:370
241	+ #: wpsc-admin/admin-form-functions.php:401

242	#: wpsc-admin/display-sales-logs.php:134
243	+ #: wpsc-taxes/controllers/taxes_controller.class.php:520


244	msgid "Name"
245	msgstr ""
246
247	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:479
248	msgid "GST"
249	msgstr ""
250
251	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:487


252	#: wpsc-theme/wpsc-cart_widget.php:52
253	#: wpsc-theme/wpsc-shopping_cart_page.php:21
254	#: wpsc-admin/display-sales-logs.php:140 wpsc-admin/display-sales-logs.php:233

255	msgid "Total"
256	msgstr ""
257
258	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:559
259	+ #: wpsc-theme/wpsc-shopping_cart_page.php:460



260	msgid "Total Shipping"
261	msgstr ""
262
263	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:560
264	msgid "Final Total"
265	msgstr ""
266
267	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:575
268	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:313
269	msgid "Customer Details"
270	msgstr ""
271
272	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:630
273	#: wpsc-theme/wpsc-user-log.php:108
274	msgid "Payment Method"
275	msgstr ""
276
277	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:631
278	msgid "Purchase #"
279	msgstr ""
280
281	+ #: wpsc-theme/functions/wpsc-user_log_functions.php:633
282	msgid "Transaction Id"
283	msgstr ""
284
285	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:103
286	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:104






287	msgid "The Transaction was successful"
288	msgstr ""
289
290	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:183
291	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:184
292	+ msgid "Click to download"
293	msgstr ""
294
295	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:195
296	+ msgid " - Shipping: %s\n"
297	msgstr ""
298
299	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:199
300	+ msgid "   Shipping: %s\n"


301	msgstr ""
302
303	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:206
304	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:207
305	+ #: wpsc-admin/display-sales-logs.php:145 wpsc-includes/checkout.class.php:143
306	+ msgid "Tax Included"



307	msgstr ""
308
309	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:237
310	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:255
311	+ msgid "Total Shipping: %s\n"

312	msgstr ""
313
314	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:239
315	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:257
316	+ msgid "Total: %s\n"

317	msgstr ""
318
319	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:242
320	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:247
321	+ #: wpsc-theme/wpsc-shopping_cart_page.php:471
322	#: wpsc-admin/display-coupons.php:153 wpsc-admin/display-coupons.php:297
323	#: wpsc-admin/admin-form-functions.php:14
324	+ #: wpsc-admin/display-sales-logs.php:214

325	msgid "Discount"
326	msgstr ""
327
328	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:252
329	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:253
330	msgid "Total Tax"
331	msgstr ""
332
333	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:259
334	+ msgid "Purchase # %s\n"
335	+ msgstr ""
336	+
337	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:263
338	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:264
339	msgid "Your Transaction ID"
340	msgstr ""
341
342	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:265

343	msgid "Transaction ID"
344	msgstr ""
345
346	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:301
347	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:302
348	+ msgid ""
349	+ "Thank you, your purchase is pending, you will be sent an email once the "
350	+ "order clears."
351	+ msgstr ""
352	+
353	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:304
354	msgid "Order Pending: Payment Required"
355	msgstr ""
356
357	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:306
358	#: wpsc-admin/includes/settings-pages/admin.php:123

359	msgid "Purchase Receipt"
360	msgstr ""
361
362	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:328
363	+ #: wpsc-admin/includes/purchlogs_upgrade.php:40
364	msgid "Billing State"
365	msgstr ""
366
367	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:337
368	msgid "Delivery State"
369	msgstr ""
370
371	+ #: wpsc-theme/functions/wpsc-transaction_results_functions.php:352
372	msgid "Purchase Report"
373	msgstr ""
374
375	+ #: wpsc-theme/wpsc-grid_view.php:79 wpsc-theme/wpsc-products_page.php:229
376	+ #: wpsc-admin/admin-form-functions.php:221
377	msgid "Sale"
378	msgstr ""
379

385	msgid "More Details"
386	msgstr ""
387
388	+ #: wpsc-theme/wpsc-products_page.php:216 wpsc-admin/includes/products.php:166
389	+ #: wpsc-admin/includes/products.php:377 wpsc-admin/display-coupons.php:302
390	+ #: wpsc-admin/display-coupons.php:382 wpsc-includes/product-template.php:603
391	+ msgid "Edit"
392	msgstr ""
393
394	#: wpsc-theme/wpsc-user-log.php:16

416	msgstr ""
417
418	#: wpsc-theme/wpsc-user-log.php:52 wpsc-theme/wpsc-user-log.php:103
419	+ #: wpsc-admin/display-items.page.php:53
420	msgid "Date"
421	msgstr ""
422

424	msgid "You have not purchased any downloadable products yet."
425	msgstr ""
426
427	+ #: wpsc-theme/wpsc-user-log.php:102 wpsc-admin/display-sales-logs.php:54
428	msgid "Status"
429	msgstr ""
430

473	msgid "Postage & Tax "
474	msgstr ""
475
476	+ #: wpsc-theme/wpsc-cart_widget.php:64 wpsc-core/wpsc-installer.php:210

477	msgid "Checkout"
478	msgstr ""
479
480	+ #: wpsc-theme/wpsc-cart_widget.php:67
481	+ msgid "Empty Your Cart"
482	+ msgstr ""
483	+
484	#: wpsc-theme/wpsc-cart_widget.php:67
485	msgid "Clear cart"
486	msgstr ""

503
504	#: wpsc-theme/wpsc-shopping_cart_page.php:60
505	#: wpsc-theme/wpsc-shopping_cart_page.php:92




506	msgid "Update"
507	msgstr ""
508

544	msgid " - Choose a Shipping Rate"
545	msgstr ""
546
547	+ #: wpsc-theme/wpsc-shopping_cart_page.php:221
548	msgid "You must sign in or register with us to continue with your purchase"
549	msgstr ""
550
551	+ #: wpsc-theme/wpsc-shopping_cart_page.php:225
552	msgid "Sign in"
553	msgstr ""
554
555	+ #: wpsc-theme/wpsc-shopping_cart_page.php:231
556	msgid "If you have bought from us before please sign in here to purchase"
557	msgstr ""
558
559	+ #: wpsc-theme/wpsc-shopping_cart_page.php:250
560	msgid "Join up now"
561	msgstr ""
562
563	+ #: wpsc-theme/wpsc-shopping_cart_page.php:252
564	msgid "Username"
565	msgstr ""
566
567	+ #: wpsc-theme/wpsc-shopping_cart_page.php:255
568	msgid "Password"
569	msgstr ""
570
571	+ #: wpsc-theme/wpsc-shopping_cart_page.php:258 wpsc-includes/share-this.php:248
572	#: wpsc-includes/share-this.php:617
573	msgid "E-mail"
574	msgstr ""
575
576	+ #: wpsc-theme/wpsc-shopping_cart_page.php:261
577	msgid ""
578	"Signing up is free and easy! please fill out your details your registration "
579	"will happen automatically as you checkout. Don't forget to use your details "
580	"to login with next time!"
581	msgstr ""
582
583	+ #: wpsc-theme/wpsc-shopping_cart_page.php:309
584	+ msgid "Same as billing address:"
585	+ msgstr ""
586	+
587	+ #: wpsc-theme/wpsc-shopping_cart_page.php:311
588	+ msgid "Your order will be shipped to the billing address"
589	msgstr ""
590
591	+ #: wpsc-theme/wpsc-shopping_cart_page.php:354
592	msgid "Enter your email address"
593	msgstr ""
594
595	+ #: wpsc-theme/wpsc-shopping_cart_page.php:392
596	msgid "How did you find us"
597	msgstr ""
598
599	+ #: wpsc-theme/wpsc-shopping_cart_page.php:395
600	msgid "Word of mouth"
601	msgstr ""
602
603	+ #: wpsc-theme/wpsc-shopping_cart_page.php:396
604	msgid "Advertising"
605	msgstr ""
606
607	+ #: wpsc-theme/wpsc-shopping_cart_page.php:397
608	msgid "Internet"
609	msgstr ""
610
611	+ #: wpsc-theme/wpsc-shopping_cart_page.php:398
612	msgid "Existing Customer"
613	msgstr ""
614
615	+ #: wpsc-theme/wpsc-shopping_cart_page.php:409
616	msgid "Payment Type"
617	msgstr ""
618
619	+ #: wpsc-theme/wpsc-shopping_cart_page.php:444
620	+ msgid ""
621	+ "I agree to The <a class='thickbox' target='_blank' href='%s' "
622	+ "class='termsandconds'>Terms and Conditions</a>"



623	msgstr ""
624
625	+ #: wpsc-theme/wpsc-shopping_cart_page.php:454
626	msgid "Review and purchase"
627	msgstr ""
628
629	+ #: wpsc-theme/wpsc-shopping_cart_page.php:483 wpsc-shipping/tablerate.php:50
630	msgid "Total Price"
631	msgstr ""
632
633	+ #: wpsc-theme/wpsc-shopping_cart_page.php:498
634	msgid "Purchase"
635	msgstr ""
636
637	+ #: wpsc-core/wpsc-installer.php:159












































































































638	msgid ""
639	"Thank you for purchasing with %shop_name%, any items to be shipped will be "
640	"processed as soon as possible, any items that can be downloaded can be "
641	"downloaded using the links on this page.All prices include tax and postage "
642	+ "and packaging where applicable.\n"
643	+ "\tYou ordered these items: \n"
644	+ "\t%product_list%%total_shipping%%total_price%"
645	msgstr ""
646
647	+ #: wpsc-core/wpsc-installer.php:162 wpsc-updates/updating_tasks.php:391
648	#: wpsc-updates/updating_tasks.php:404
649	msgid "%product_list%%total_shipping%%total_price%"
650	msgstr ""
651
652	+ #: wpsc-core/wpsc-installer.php:204
653	msgid "Products Page"
654	msgstr ""
655
656	+ #: wpsc-core/wpsc-installer.php:216
657	msgid "Transaction Results"
658	msgstr ""
659
660	+ #: wpsc-core/wpsc-installer.php:222
661	msgid "Your Account"
662	msgstr ""
663
664	+ #: wpsc-core/wpsc-installer.php:293
665	msgid "Product Category"
666	msgstr ""
667
668	+ #: wpsc-core/wpsc-installer.php:300
669	msgid "This is a description"
670	msgstr ""
671
672	+ #: wpsc-core/wpsc-installer.php:744
673	msgid "Your billing/contact details"
674	msgstr ""
675
676	+ #: wpsc-core/wpsc-installer.php:747 wpsc-core/wpsc-installer.php:756
677	+ #: wpsc-admin/admin-form-functions.php:371
678	msgid "Address"
679	msgstr ""
680
681	+ #: wpsc-core/wpsc-installer.php:749 wpsc-core/wpsc-installer.php:758
682	+ #: wpsc-admin/admin-form-functions.php:320
683	#: wpsc-admin/admin-form-functions.php:328

684	msgid "State"
685	msgstr ""
686
687	+ #: wpsc-core/wpsc-installer.php:751 wpsc-core/wpsc-installer.php:760
688	msgid "Postal Code"
689	msgstr ""
690




691	#: wpsc-core/js/tinymce3/window.php:9
692	msgid "You don't have permission to be doing that!"
693	msgstr ""
694
695	+ #: wpsc-core/js/tinymce3/window.php:43 wpsc-admin/admin-form-functions.php:229
696	msgid "Category"
697	msgstr ""
698
699	+ #: wpsc-core/js/tinymce3/window.php:44 wpsc-core/wpsc-functions.php:291
700	msgid "Products"
701	msgstr ""
702

784	"things like images "
785	msgstr ""
786
787	+ #: wpsc-core/js/tinymce3/window.php:145
788	+ msgid "[preview] Preview In Here [/preview]"
789	+ msgstr ""
790	+
791	#: wpsc-core/js/tinymce3/window.php:149
792	msgid ""
793	" You don't have the Members and Capabilities plugin installed, to start "

839	msgid "This will add the selected product to your page."
840	msgstr ""
841
842	+ #: wpsc-core/js/tinymce3/window.php:203 wpsc-admin/includes/products.php:135


843	msgid "Cancel"
844	msgstr ""
845

847	msgid "Insert"
848	msgstr ""
849
850	+ #: wpsc-core/wpsc-functions.php:139
851	msgid "Incomplete Sale"
852	msgstr ""
853
854	+ #: wpsc-core/wpsc-functions.php:144
855	msgid "Order Received"
856	msgstr ""
857
858	+ #: wpsc-core/wpsc-functions.php:149
859	msgid "Accepted Payment"
860	msgstr ""
861
862	+ #: wpsc-core/wpsc-functions.php:155
863	msgid "Job Dispatched"
864	msgstr ""
865
866	+ #: wpsc-core/wpsc-functions.php:161
867	msgid "Closed Order"
868	msgstr ""
869
870	+ #: wpsc-core/wpsc-functions.php:167
871	msgid "Payment Declined"
872	msgstr ""
873
874	+ #: wpsc-core/wpsc-functions.php:253
875	msgid "Please Note"
876	msgstr ""
877
878	+ #: wpsc-core/wpsc-functions.php:254
879	msgid ""
880	"Before upgrading you should check the <a %s>upgrade information</a> and "
881	"changelog as you may need to make updates to your template files."
882	msgstr ""
883
884	+ #: wpsc-core/wpsc-functions.php:280
885	+ msgctxt "post type name"
886	msgid "Products"
887	msgstr ""
888
889	+ #: wpsc-core/wpsc-functions.php:281
890	+ msgctxt "post type singular name"
891	msgid "Product"
892	msgstr ""
893
894	+ #: wpsc-core/wpsc-functions.php:282
895	+ msgctxt "admin menu: add new product"
896	msgid "Add New"
897	msgstr ""
898
899	+ #: wpsc-core/wpsc-functions.php:283

900	msgid "Add New Product"
901	msgstr ""
902
903	+ #: wpsc-core/wpsc-functions.php:284
904	msgid "Edit Product"
905	msgstr ""
906
907	+ #: wpsc-core/wpsc-functions.php:285
908	msgid "New Product"
909	msgstr ""
910
911	+ #: wpsc-core/wpsc-functions.php:286
912	msgid "View Product"
913	msgstr ""
914
915	+ #: wpsc-core/wpsc-functions.php:287
916	msgid "Search Products"
917	msgstr ""
918
919	+ #: wpsc-core/wpsc-functions.php:288
920	msgid "No products found"
921	msgstr ""
922
923	+ #: wpsc-core/wpsc-functions.php:289
924	msgid "No products found in Trash"
925	msgstr ""
926
927	+ #: wpsc-core/wpsc-functions.php:320
928	msgctxt "taxonomy general name"
929	msgid "Product Tags"
930	msgstr ""
931
932	+ #: wpsc-core/wpsc-functions.php:321
933	msgctxt "taxonomy singular name"
934	msgid "Product Tag"
935	msgstr ""
936
937	+ #: wpsc-core/wpsc-functions.php:322
938	msgid "Product Search Tags"
939	msgstr ""
940
941	+ #: wpsc-core/wpsc-functions.php:323
942	msgid "All Product Tags"
943	msgstr ""
944
945	+ #: wpsc-core/wpsc-functions.php:324
946	msgid "Edit Tag"
947	msgstr ""
948
949	+ #: wpsc-core/wpsc-functions.php:325
950	msgid "Update Tag"
951	msgstr ""
952
953	+ #: wpsc-core/wpsc-functions.php:326
954	msgid "Add new Product Tag"
955	msgstr ""
956
957	+ #: wpsc-core/wpsc-functions.php:327
958	msgid "New Product Tag Name"
959	msgstr ""
960
961	+ #: wpsc-core/wpsc-functions.php:339
962	+ msgctxt "taxonomy general name"
963	+ msgid "Categories"
964	+ msgstr ""
965	+
966	+ #: wpsc-core/wpsc-functions.php:340
967	+ msgctxt "taxonomy singular name"
968	+ msgid "Product Category"
969	+ msgstr ""
970	+
971	+ #: wpsc-core/wpsc-functions.php:341
972	+ msgid "Search Product Categories"
973	+ msgstr ""
974	+
975	+ #: wpsc-core/wpsc-functions.php:342
976	+ msgid "All Product Categories"
977	+ msgstr ""
978	+
979	+ #: wpsc-core/wpsc-functions.php:343
980	+ msgid "Parent Product Category"
981	+ msgstr ""
982	+
983	+ #: wpsc-core/wpsc-functions.php:344
984	+ msgid "Parent Product Category:"
985	+ msgstr ""
986	+
987	+ #: wpsc-core/wpsc-functions.php:345
988	+ msgid "Edit Product Category"
989	+ msgstr ""
990	+
991	+ #: wpsc-core/wpsc-functions.php:346
992	+ msgid "Update Product Category"
993	+ msgstr ""
994	+
995	+ #: wpsc-core/wpsc-functions.php:347
996	+ msgid "Add New Product Category"
997	+ msgstr ""
998	+
999	+ #: wpsc-core/wpsc-functions.php:348
1000	+ msgid "New Product Category Name"
1001	+ msgstr ""
1002	+
1003	+ #: wpsc-core/wpsc-functions.php:359
1004	msgctxt "taxonomy general name"
1005	msgid "Variations"
1006	msgstr ""
1007
1008	+ #: wpsc-core/wpsc-functions.php:360
1009	msgctxt "taxonomy singular name"
1010	msgid "Variation"
1011	msgstr ""
1012
1013	+ #: wpsc-core/wpsc-functions.php:361
1014	msgid "Search Variations"
1015	msgstr ""
1016
1017	+ #: wpsc-core/wpsc-functions.php:362
1018	msgid "All Variations"
1019	msgstr ""
1020
1021	+ #: wpsc-core/wpsc-functions.php:363
1022	msgid "Parent Variation"
1023	msgstr ""
1024
1025	+ #: wpsc-core/wpsc-functions.php:364
1026	msgid "Parent Variations:"
1027	msgstr ""
1028
1029	+ #: wpsc-core/wpsc-functions.php:365
1030	msgid "Edit Variation"
1031	msgstr ""
1032
1033	+ #: wpsc-core/wpsc-functions.php:366
1034	msgid "Update Variation"
1035	msgstr ""
1036
1037	+ #: wpsc-core/wpsc-functions.php:367
1038	+ msgid "Add New Variation/Set"
1039	msgstr ""
1040
1041	+ #: wpsc-core/wpsc-functions.php:368
1042	msgid "New Variation Name"
1043	msgstr ""
1044

1080	msgid "Test Mode Enabled:"
1081	msgstr ""
1082
1083	+ #: wpsc-merchants/paypal-pro.merchant.php:375
1084	+ msgid "Credit Card Number *"
1085	+ msgstr ""
1086	+
1087	+ #: wpsc-merchants/paypal-pro.merchant.php:381
1088	+ msgid "Credit Card Expiry *"
1089	+ msgstr ""
1090	+
1091	+ #: wpsc-merchants/paypal-pro.merchant.php:404
1092	+ msgid "CVV *"
1093	+ msgstr ""
1094	+
1095	+ #: wpsc-merchants/paypal-pro.merchant.php:409
1096	+ msgid "Card Type *"
1097	+ msgstr ""
1098	+
1099	+ #: wpsc-merchants/paypal-pro.merchant.php:412
1100	+ msgid "Visa"
1101	+ msgstr ""
1102	+
1103	+ #: wpsc-merchants/paypal-pro.merchant.php:413
1104	+ msgid "MasterCard"
1105	+ msgstr ""
1106	+
1107	+ #: wpsc-merchants/paypal-pro.merchant.php:414
1108	+ msgid "Discover"
1109	+ msgstr ""
1110	+
1111	+ #: wpsc-merchants/paypal-pro.merchant.php:415
1112	+ msgid "Amex"
1113	+ msgstr ""
1114	+
1115	#: wpsc-merchants/chronopay.php:436
1116	+ #: wpsc-merchants/paypal-standard.merchant.php:532
1117	+ #: wpsc-merchants/paypal-standard.merchant.php:540
1118	+ #: wpsc-merchants/paypal-standard.merchant.php:556
1119	+ #: wpsc-admin/includes/save-data.functions.php:308
1120	+ #: wpsc-admin/includes/save-data.functions.php:533
1121	+ #: wpsc-admin/includes/settings-pages/presentation.php:276
1122	+ #: wpsc-admin/includes/settings-pages/presentation.php:303
1123	+ #: wpsc-admin/includes/settings-pages/presentation.php:321
1124	+ #: wpsc-admin/includes/settings-pages/presentation.php:344
1125	+ #: wpsc-admin/includes/settings-pages/presentation.php:367
1126	+ #: wpsc-admin/includes/settings-pages/presentation.php:390
1127	+ #: wpsc-admin/includes/settings-pages/presentation.php:413
1128	+ #: wpsc-admin/includes/settings-pages/presentation.php:553
1129	+ #: wpsc-admin/includes/settings-pages/presentation.php:621
1130	+ #: wpsc-admin/includes/settings-pages/presentation.php:670
1131	+ #: wpsc-admin/includes/settings-pages/presentation.php:714
1132	+ #: wpsc-admin/includes/settings-pages/presentation.php:749
1133	+ #: wpsc-admin/includes/settings-pages/presentation.php:771
1134	+ #: wpsc-admin/includes/settings-pages/presentation.php:879
1135	+ #: wpsc-admin/includes/settings-pages/presentation.php:906
1136	+ #: wpsc-admin/includes/settings-pages/presentation.php:930
1137	+ #: wpsc-admin/includes/settings-pages/presentation.php:956
1138	+ #: wpsc-admin/includes/settings-pages/presentation.php:981
1139	+ #: wpsc-admin/includes/settings-pages/presentation.php:1037
1140	+ #: wpsc-admin/includes/settings-pages/presentation.php:1063
1141	+ #: wpsc-admin/includes/settings-pages/presentation.php:1084
1142	+ #: wpsc-admin/includes/settings-pages/presentation.php:1128
1143	+ #: wpsc-admin/includes/settings-pages/presentation.php:1173
1144	+ #: wpsc-admin/includes/settings-pages/presentation.php:1226
1145	#: wpsc-admin/includes/settings-pages/admin.php:38
1146	#: wpsc-admin/includes/settings-pages/admin.php:64
1147	#: wpsc-admin/includes/settings-pages/checkout.php:51

1150	#: wpsc-admin/includes/settings-pages/shipping.php:66
1151	#: wpsc-admin/includes/settings-pages/shipping.php:108
1152	#: wpsc-admin/includes/settings-pages/shipping.php:139
1153	+ #: wpsc-admin/includes/display-items-functions.php:765
1154	msgid "Yes"
1155	msgstr ""
1156
1157	#: wpsc-merchants/chronopay.php:437
1158	+ #: wpsc-merchants/paypal-standard.merchant.php:533
1159	+ #: wpsc-merchants/paypal-standard.merchant.php:541
1160	+ #: wpsc-merchants/paypal-standard.merchant.php:557
1161	+ #: wpsc-admin/includes/save-data.functions.php:309
1162	+ #: wpsc-admin/includes/save-data.functions.php:534
1163	+ #: wpsc-admin/includes/settings-pages/presentation.php:277
1164	+ #: wpsc-admin/includes/settings-pages/presentation.php:304
1165	+ #: wpsc-admin/includes/settings-pages/presentation.php:322
1166	+ #: wpsc-admin/includes/settings-pages/presentation.php:345
1167	+ #: wpsc-admin/includes/settings-pages/presentation.php:368
1168	+ #: wpsc-admin/includes/settings-pages/presentation.php:392
1169	+ #: wpsc-admin/includes/settings-pages/presentation.php:416
1170	+ #: wpsc-admin/includes/settings-pages/presentation.php:555
1171	+ #: wpsc-admin/includes/settings-pages/presentation.php:622
1172	+ #: wpsc-admin/includes/settings-pages/presentation.php:671
1173	+ #: wpsc-admin/includes/settings-pages/presentation.php:715
1174	+ #: wpsc-admin/includes/settings-pages/presentation.php:750
1175	+ #: wpsc-admin/includes/settings-pages/presentation.php:772
1176	+ #: wpsc-admin/includes/settings-pages/presentation.php:880
1177	+ #: wpsc-admin/includes/settings-pages/presentation.php:907
1178	+ #: wpsc-admin/includes/settings-pages/presentation.php:931
1179	+ #: wpsc-admin/includes/settings-pages/presentation.php:957
1180	+ #: wpsc-admin/includes/settings-pages/presentation.php:982
1181	+ #: wpsc-admin/includes/settings-pages/presentation.php:1038
1182	+ #: wpsc-admin/includes/settings-pages/presentation.php:1064
1183	+ #: wpsc-admin/includes/settings-pages/presentation.php:1085
1184	+ #: wpsc-admin/includes/settings-pages/presentation.php:1129
1185	+ #: wpsc-admin/includes/settings-pages/presentation.php:1174
1186	+ #: wpsc-admin/includes/settings-pages/presentation.php:1227
1187	#: wpsc-admin/includes/settings-pages/admin.php:39
1188	#: wpsc-admin/includes/settings-pages/admin.php:65
1189	#: wpsc-admin/includes/settings-pages/checkout.php:52

1192	#: wpsc-admin/includes/settings-pages/shipping.php:67
1193	#: wpsc-admin/includes/settings-pages/shipping.php:109
1194	#: wpsc-admin/includes/settings-pages/shipping.php:140
1195	+ #: wpsc-admin/includes/display-items-functions.php:766
1196	msgid "No"
1197	msgstr ""
1198
1199	#: wpsc-merchants/chronopay.php:449
1200	+ #: wpsc-merchants/paypal-standard.merchant.php:615
1201	+ #: wpsc-admin/includes/settings-pages/presentation.php:1262
1202	#: wpsc-admin/includes/settings-pages/admin.php:166
1203	#: wpsc-admin/includes/settings-pages/marketing.php:82
1204	+ #: wpsc-admin/includes/settings-pages/general.php:160
1205	+ #: wpsc-admin/includes/settings-pages/shipping.php:162
1206	+ #: wpsc-admin/includes/settings-pages/shipping.php:235
1207	+ #: wpsc-admin/includes/settings-pages/shipping.php:262
1208	#: wpsc-admin/includes/settings-pages/gateway.php:113
1209	#: wpsc-admin/includes/settings-pages/gateway.php:148
1210	msgid "Update »"

1220	msgid "Save Changes"
1221	msgstr ""
1222
1223	+ #: wpsc-merchants/paypal-standard.merchant.php:170
1224	msgid "Your Subscription"
1225	msgstr ""
1226
1227	+ #: wpsc-merchants/paypal-standard.merchant.php:580
1228	+ #: wpsc-merchants/paypal-express.merchant.php:293
1229	msgid "Currency Converter"
1230	msgstr ""
1231
1232	+ #: wpsc-merchants/paypal-standard.merchant.php:583
1233	msgid ""
1234	"Your website uses <strong>%s</strong>. This currency is not supported by "
1235	"PayPal, please select a currency using the drop down menu below. Buyers on "

1237	"order through to Paypal using the currency you choose below."
1238	msgstr ""
1239
1240	+ #: wpsc-merchants/paypal-express.merchant.php:12
1241	+ msgid "PayPal Express Checkout 2.0"
1242	+ msgstr ""
1243	+
1244	+ #: wpsc-merchants/paypal-express.merchant.php:18
1245	+ msgid "PayPal Express"
1246	+ msgstr ""
1247	+
1248	+ #: wpsc-merchants/paypal-express.merchant.php:256
1249	+ msgid "API Username"
1250	+ msgstr ""
1251	+
1252	+ #: wpsc-merchants/paypal-express.merchant.php:263
1253	+ msgid "API Password"
1254	+ msgstr ""
1255	+
1256	+ #: wpsc-merchants/paypal-express.merchant.php:270
1257	+ msgid "API Signature"
1258	+ msgstr ""
1259	+
1260	+ #: wpsc-merchants/paypal-express.merchant.php:277
1261	+ msgid "Server Type"
1262	+ msgstr ""
1263	+
1264	+ #: wpsc-merchants/paypal-express.merchant.php:280
1265	+ msgid "Sandbox (For testing)"
1266	+ msgstr ""
1267	+
1268	+ #: wpsc-merchants/paypal-express.merchant.php:281
1269	+ msgid "Production"
1270	+ msgstr ""
1271	+
1272	+ #: wpsc-merchants/paypal-express.merchant.php:295
1273	msgid ""
1274	"Your website is using a currency not accepted by PayPal, select an accepted "
1275	"currency using the drop down menu bellow. Buyers on your site will still pay "

1277	"order through to PayPal using the currency you choose below."
1278	msgstr ""
1279
1280	+ #: wpsc-merchants/paypal-express.merchant.php:298
1281	+ msgid "Convert to"
1282	+ msgstr ""
1283	+
1284	+ #: wpsc-merchants/paypal-express.merchant.php:378
1285	+ msgid "The PayPal API has returned an error!"
1286	+ msgstr ""
1287	+
1288	+ #: wpsc-merchants/paypal-express.merchant.php:423
1289	+ #: wpsc-merchants/paypal-express.merchant.php:602
1290	+ msgid "Error Number:"
1291	+ msgstr ""
1292	+
1293	+ #: wpsc-merchants/paypal-express.merchant.php:427
1294	+ msgid "Short Message:"
1295	+ msgstr ""
1296	+
1297	+ #: wpsc-merchants/paypal-express.merchant.php:431
1298	+ msgid "Long Message:"
1299	+ msgstr ""
1300	+
1301	+ #: wpsc-merchants/paypal-express.merchant.php:606
1302	+ msgid "Shipping Address:"
1303	+ msgstr ""
1304	+
1305	+ #: wpsc-merchants/paypal-express.merchant.php:610
1306	+ msgid "Street 1:"
1307	+ msgstr ""
1308	+
1309	+ #: wpsc-merchants/paypal-express.merchant.php:616
1310	+ msgid "Street 2:"
1311	+ msgstr ""
1312	+
1313	+ #: wpsc-merchants/paypal-express.merchant.php:622
1314	+ msgid "City:"
1315	+ msgstr ""
1316	+
1317	+ #: wpsc-merchants/paypal-express.merchant.php:628
1318	+ msgid "State:"
1319	+ msgstr ""
1320	+
1321	+ #: wpsc-merchants/paypal-express.merchant.php:633
1322	+ msgid "Postal code:"
1323	+ msgstr ""
1324	+
1325	+ #: wpsc-merchants/paypal-express.merchant.php:639
1326	+ msgid "Country:"
1327	+ msgstr ""
1328	+
1329	+ #: wpsc-merchants/paypal-express.merchant.php:656
1330	msgid "Confirm Payment"
1331	msgstr ""
1332

1335	msgstr ""
1336
1337	#: wpsc-widgets/category_widget.php:19 wpsc-widgets/category_widget.php:34


1338	msgid "Product Categories"
1339	msgstr ""
1340

1356	msgstr ""
1357
1358	#: wpsc-widgets/category_widget.php:140
1359	+ #: wpsc-admin/includes/settings-pages/presentation.php:964
1360	msgid "Use Category Grid View"
1361	msgstr ""
1362
1363	+ #: wpsc-widgets/category_widget.php:142
1364	+ #: wpsc-widgets/latest_product_widget.php:98
1365	+ #: wpsc-widgets/specials_widget.php:106
1366	+ #: wpsc-admin/includes/settings-pages/presentation.php:1047
1367	+ msgid "Show Thumbnails"
1368	+ msgstr ""
1369	+
1370	#: wpsc-widgets/category_widget.php:148
1371	msgid " Show N/A when No Image Available"
1372	msgstr ""

1484	msgid "Fix Product Group Permalinks"
1485	msgstr ""
1486
1487	+ #: wpsc-admin/includes/purchlogs_upgrade.php:35
1488	+ msgid "Select an Option"




1489	msgstr ""
1490
1491	+ #: wpsc-admin/includes/purchlogs_upgrade.php:36
1492	+ msgid "Billing First Name"

1493	msgstr ""
1494
1495	+ #: wpsc-admin/includes/purchlogs_upgrade.php:37
1496	+ msgid "Billing Last Name"
1497	msgstr ""
1498
1499	+ #: wpsc-admin/includes/purchlogs_upgrade.php:38
1500	+ msgid "Billing Address"
1501	msgstr ""
1502
1503	+ #: wpsc-admin/includes/purchlogs_upgrade.php:39
1504	+ msgid "Billing City"
1505	msgstr ""
1506
1507	+ #: wpsc-admin/includes/purchlogs_upgrade.php:41
1508	+ msgid "Billing Country"
1509	msgstr ""
1510
1511	+ #: wpsc-admin/includes/purchlogs_upgrade.php:42
1512	+ msgid "Billing Email"
1513	msgstr ""
1514
1515	+ #: wpsc-admin/includes/purchlogs_upgrade.php:43
1516	+ msgid "Billing Phone"
1517	msgstr ""
1518
1519	+ #: wpsc-admin/includes/purchlogs_upgrade.php:44
1520	+ msgid "Billing Post Code"








1521	msgstr ""
1522
1523	+ #: wpsc-admin/includes/purchlogs_upgrade.php:45
1524	+ msgid "Shipping First Name"











1525	msgstr ""
1526
1527	+ #: wpsc-admin/includes/purchlogs_upgrade.php:46
1528	+ msgid "Shipping Last Name"

1529	msgstr ""
1530
1531	+ #: wpsc-admin/includes/purchlogs_upgrade.php:48
1532	+ msgid "Shipping City"
1533	msgstr ""
1534
1535	+ #: wpsc-admin/includes/purchlogs_upgrade.php:49
1536	+ msgid "Shipping State"
1537	msgstr ""
1538
1539	+ #: wpsc-admin/includes/purchlogs_upgrade.php:50
1540	+ msgid "Shipping Country"
1541	msgstr ""
1542
1543	+ #: wpsc-admin/includes/purchlogs_upgrade.php:51
1544	+ msgid "Shipping Post Code"
1545	msgstr ""
1546
1547	+ #: wpsc-admin/includes/purchlogs_upgrade.php:62
1548	+ msgid "Check Out Form Fields updated."


1549	msgstr ""
1550
1551	+ #: wpsc-admin/includes/purchlogs_upgrade.php:68
1552	+ msgid "Sales Upgrade Fix"

1553	msgstr ""
1554
1555	+ #: wpsc-admin/includes/purchlogs_upgrade.php:69
1556	+ msgid ""
1557	+ "Upgrading to WP e-Commerce 3.7 and later requires you to run this fix once."
1558	+ "The following Boxes corresponds to the form fields in your current checkout "
1559	+ "page. All you have to do is select from the drop-down menu box what each of "
1560	+ "the following fields represent. Sorry for any inconvenience caused, but "
1561	+ "we're sure you'll agree that the new purchase logs are worth this minor "
1562	+ "hassle."
1563	+ msgstr ""
1564	+
1565	+ #: wpsc-admin/includes/purchlogs_upgrade.php:100
1566	+ #: wpsc-admin/display-sales-logs.php:297
1567	+ msgid "Apply"
1568	+ msgstr ""
1569	+
1570	+ #: wpsc-admin/includes/save-data.functions.php:71
1571	+ msgid "Image"
1572	+ msgstr ""
1573	+
1574	+ #: wpsc-admin/includes/save-data.functions.php:141
1575	+ #: wpsc-admin/includes/save-data.functions.php:348 wpsc-admin/admin.php:310
1576	+ msgid "Advanced Settings"
1577	msgstr ""
1578
1579	+ #: wpsc-admin/includes/save-data.functions.php:144
1580	+ msgid "Presentation Settings"
1581	+ msgstr ""
1582	+
1583	+ #: wpsc-admin/includes/save-data.functions.php:149
1584	+ #: wpsc-admin/includes/save-data.functions.php:409
1585	+ msgid "Category Image"
1586	+ msgstr ""
1587	+
1588	+ #: wpsc-admin/includes/save-data.functions.php:157
1589	+ #: wpsc-admin/includes/save-data.functions.php:354
1590	+ msgid "Catalog View"
1591	+ msgstr ""
1592	+
1593	+ #: wpsc-admin/includes/save-data.functions.php:193
1594	+ #: wpsc-admin/includes/save-data.functions.php:390
1595	+ #: wpsc-includes/form-display.functions.php:9
1596	+ msgid "Please select"
1597	+ msgstr ""
1598	+
1599	+ #: wpsc-admin/includes/save-data.functions.php:194
1600	+ #: wpsc-admin/includes/save-data.functions.php:391
1601	+ #: wpsc-admin/includes/settings-pages/presentation.php:481
1602	+ msgid "Default View"
1603	+ msgstr ""
1604	+
1605	+ #: wpsc-admin/includes/save-data.functions.php:197
1606	+ #: wpsc-admin/includes/save-data.functions.php:199
1607	+ #: wpsc-admin/includes/save-data.functions.php:394
1608	+ #: wpsc-admin/includes/save-data.functions.php:396
1609	+ #: wpsc-admin/includes/settings-pages/presentation.php:485
1610	+ #: wpsc-admin/includes/settings-pages/presentation.php:489
1611	msgid "List View"
1612	msgstr ""
1613
1614	+ #: wpsc-admin/includes/save-data.functions.php:202
1615	+ #: wpsc-admin/includes/save-data.functions.php:204
1616	+ #: wpsc-admin/includes/save-data.functions.php:399
1617	+ #: wpsc-admin/includes/save-data.functions.php:401
1618	+ #: wpsc-admin/includes/settings-pages/presentation.php:495
1619	+ #: wpsc-admin/includes/settings-pages/presentation.php:499
1620	msgid "Grid View"
1621	msgstr ""
1622
1623	+ #: wpsc-admin/includes/save-data.functions.php:211
1624	+ #: wpsc-admin/includes/save-data.functions.php:404
1625	+ msgid ""
1626	+ "To over-ride the presentation settings for this group you can enter in your "
1627	+ "prefered settings here"
1628	msgstr ""
1629
1630	+ #: wpsc-admin/includes/save-data.functions.php:218
1631	+ msgid "Thumbnail Size"





1632	msgstr ""
1633
1634	+ #: wpsc-admin/includes/save-data.functions.php:221
1635	+ #: wpsc-admin/includes/save-data.functions.php:423
1636	+ #: wpsc-admin/includes/settings-pages/presentation.php:995
1637	+ #: wpsc-admin/includes/settings-pages/presentation.php:1005
1638	+ #: wpsc-admin/includes/settings-pages/presentation.php:1014
1639	+ #: wpsc-admin/includes/settings-pages/presentation.php:1138
1640	+ #: wpsc-admin/includes/display-items-functions.php:597
1641	msgid "Width"
1642	msgstr ""
1643
1644	+ #: wpsc-admin/includes/save-data.functions.php:222
1645	+ #: wpsc-admin/includes/save-data.functions.php:424
1646	+ #: wpsc-admin/includes/settings-pages/presentation.php:996
1647	+ #: wpsc-admin/includes/settings-pages/presentation.php:1006
1648	+ #: wpsc-admin/includes/settings-pages/presentation.php:1015
1649	+ #: wpsc-admin/includes/settings-pages/presentation.php:1139
1650	+ #: wpsc-admin/includes/display-items-functions.php:584
1651	+ msgid "Height"
1652	msgstr ""
1653
1654	+ #: wpsc-admin/includes/save-data.functions.php:233
1655	+ #: wpsc-admin/includes/save-data.functions.php:455
1656	msgid "Target Market Restrictions"
1657	msgstr ""
1658
1659	+ #: wpsc-admin/includes/save-data.functions.php:242
1660	+ #: wpsc-admin/includes/save-data.functions.php:464
1661	#: wpsc-admin/includes/settings-pages/general.php:52
1662	msgid "Target Markets"
1663	msgstr ""
1664
1665	+ #: wpsc-admin/includes/save-data.functions.php:247
1666	msgid ""
1667	"The Target Markets feature has been disabled because you have the Suhosin "
1668	"PHP extension installed on this server. If you need to use the Target "

1671	"\t\t\t"
1672	msgstr ""
1673
1674	+ #: wpsc-admin/includes/save-data.functions.php:273
1675	+ #: wpsc-admin/includes/save-data.functions.php:496
1676	msgid "Checkout Settings"
1677	msgstr ""
1678
1679	+ #: wpsc-admin/includes/save-data.functions.php:281
1680	msgid "This category requires additional checkout form fields"
1681	msgstr ""
1682
1683	+ #: wpsc-admin/includes/save-data.functions.php:285
1684	+ #: wpsc-admin/includes/save-data.functions.php:475
1685	+ #: wpsc-admin/includes/save-data.functions.php:513
1686	msgid "None"
1687	msgstr ""
1688
1689	+ #: wpsc-admin/includes/save-data.functions.php:305
1690	+ #: wpsc-admin/includes/save-data.functions.php:530
1691	msgid "Products in this category use the billing address to calculate shipping"
1692	msgstr ""
1693
1694	+ #: wpsc-admin/includes/save-data.functions.php:413
1695	+ msgid "Delete Image"
1696	msgstr ""
1697
1698	+ #: wpsc-admin/includes/save-data.functions.php:414
1699	+ msgid ""
1700	+ "You can set an image for the category here. If one exists, check the box to "
1701	+ "delete."
1702	msgstr ""
1703
1704	+ #: wpsc-admin/includes/save-data.functions.php:420
1705	+ msgid "Thumbnail Size"
1706	+ msgstr ""


1707
1708	+ #: wpsc-admin/includes/save-data.functions.php:429
1709	+ msgid "Shortcodes and Template Tags"

1710	msgstr ""
1711
1712	+ #: wpsc-admin/includes/save-data.functions.php:434
1713	+ msgid "Display Category Shortcode"
1714	+ msgstr ""
1715	+
1716	+ #: wpsc-admin/includes/save-data.functions.php:438
1717	msgid ""
1718	+ "Shortcodes are used to display a particular category or group within any "
1719	+ "WordPress page or post."
1720	+ msgstr ""
1721	+
1722	+ #: wpsc-admin/includes/save-data.functions.php:443
1723	+ msgid "Display Category Template Tag"
1724	+ msgstr ""
1725	+
1726	+ #: wpsc-admin/includes/save-data.functions.php:447
1727	+ msgid ""
1728	+ "Template tags are used to display a particular category or group within your "
1729	+ "theme / template."
1730	+ msgstr ""
1731	+
1732	+ #: wpsc-admin/includes/save-data.functions.php:470
1733	+ msgid ""
1734	+ "The Target Markets feature has been disabled because you have the Suhosin "
1735	+ "PHP extension installed on this server. If you need to use the Target "
1736	+ "Markets feature, then disable the suhosin extension. If you can not do this, "
1737	+ "you will need to contact your hosting provider."
1738	+ msgstr ""
1739	+
1740	+ #: wpsc-admin/includes/save-data.functions.php:475
1741	+ msgid "Select"
1742	+ msgstr ""
1743	+
1744	+ #: wpsc-admin/includes/save-data.functions.php:475
1745	+ msgid "All"
1746	+ msgstr ""
1747	+
1748	+ #: wpsc-admin/includes/save-data.functions.php:489
1749	+ msgid "Select the markets you are selling this category to."
1750	+ msgstr ""
1751	+
1752	+ #: wpsc-admin/includes/save-data.functions.php:509
1753	+ msgid "Category requires additional checkout form fields"
1754	msgstr ""
1755
1756	#: wpsc-admin/includes/settings-pages/presentation.php:48

1761	msgid "You did not specify any template files to be moved."
1762	msgstr ""
1763
1764	+ #: wpsc-admin/includes/settings-pages/presentation.php:66
1765	+ msgid ""
1766	+ "Error: some files could not be copied. Please make sure that theme folder is "
1767	+ "writable."
1768	+ msgstr ""
1769	+
1770	+ #: wpsc-admin/includes/settings-pages/presentation.php:68
1771	msgid "Thanks, the themes have been copied."
1772	msgstr ""
1773
1774	+ #: wpsc-admin/includes/settings-pages/presentation.php:78
1775	msgid ""
1776	"Thanks, you have made a succesful backup of your theme. It is located at "
1777	"the URL below. Please note each backup you create will replace your "

1779	msgstr ""
1780
1781	#. Some themes have been moved to the themes folder
1782	+ #: wpsc-admin/includes/settings-pages/presentation.php:88
1783	msgid "Some Theme files have been moved to your WordPress Theme Folder."
1784	msgstr ""
1785
1786	+ #: wpsc-admin/includes/settings-pages/presentation.php:90
1787	msgid "No Theme files have been moved to your WordPress Theme Folder."
1788	msgstr ""
1789
1790	+ #: wpsc-admin/includes/settings-pages/presentation.php:96
1791	msgid ""
1792	"WP e-Commerce provides you the ability to move your theme files to a safe "
1793	"place for theming control.\n"

1797	"files to your active WordPress theme. "
1798	msgstr ""
1799
1800	+ #: wpsc-admin/includes/settings-pages/presentation.php:114
1801	msgid ""
1802	"To change the look of certain aspects of your shop, you can edit the moved "
1803	"files that are found here:"
1804	msgstr ""
1805
1806	+ #: wpsc-admin/includes/settings-pages/presentation.php:124
1807	msgid ""
1808	"You can create a copy of your WordPress Theme by clicking the backup button "
1809	"bellow. Once copied you can find them here:"
1810	msgstr ""
1811
1812	+ #: wpsc-admin/includes/settings-pages/presentation.php:128
1813	msgid "<a href=\"%s\" class=\"button\">Backup Your WordPress Theme</a>"
1814	msgstr ""
1815
1816	+ #: wpsc-admin/includes/settings-pages/presentation.php:133
1817	msgid ""
1818	"If you have moved your files in some other way i.e FTP, you may need to "
1819	"click the Flush Theme Cache. This will refresh the locations WordPress looks "
1820	"for your templates."
1821	msgstr ""
1822
1823	+ #: wpsc-admin/includes/settings-pages/presentation.php:134
1824	msgid "<a href=\"%s\" class=\"button\">Flush Theme Cache</a>"
1825	msgstr ""
1826
1827	+ #: wpsc-admin/includes/settings-pages/presentation.php:163
1828	msgid "Show All Products"
1829	msgstr ""
1830
1831	+ #: wpsc-admin/includes/settings-pages/presentation.php:170
1832	msgid "Show list of product categories"
1833	msgstr ""
1834
1835	+ #: wpsc-admin/includes/settings-pages/presentation.php:224
1836	msgid "Button Settings"
1837	msgstr ""
1838
1839	+ #: wpsc-admin/includes/settings-pages/presentation.php:228
1840	msgid "Button Type"
1841	msgstr ""
1842
1843	+ #: wpsc-admin/includes/settings-pages/presentation.php:251
1844	msgid ""
1845	"Buy Now Button only works for Paypal Standard, please activate Paypal "
1846	"Standard to enable this option."
1847	msgstr ""
1848
1849	+ #: wpsc-admin/includes/settings-pages/presentation.php:260
1850	msgid "Hide \"Add to cart\" button"
1851	msgstr ""
1852
1853	+ #: wpsc-admin/includes/settings-pages/presentation.php:282
1854	msgid "Product Settings"
1855	msgstr ""
1856
1857	+ #: wpsc-admin/includes/settings-pages/presentation.php:287
1858	+ msgid "Show Product Ratings"
1859	+ msgstr ""
1860	+
1861	+ #: wpsc-admin/includes/settings-pages/presentation.php:318
1862	msgid "Show Stock Availability"
1863	msgstr ""
1864
1865	+ #: wpsc-admin/includes/settings-pages/presentation.php:327
1866	msgid "Display Fancy Purchase Notifications"
1867	msgstr ""
1868
1869	+ #: wpsc-admin/includes/settings-pages/presentation.php:351
1870	msgid "Display per item shipping"
1871	msgstr ""
1872
1873	+ #: wpsc-admin/includes/settings-pages/presentation.php:373
1874	msgid "Disable link in Title"
1875	msgstr ""
1876
1877	+ #: wpsc-admin/includes/settings-pages/presentation.php:397
1878	msgid "Add quantity field to each product description"
1879	msgstr ""
1880
1881	+ #: wpsc-admin/includes/settings-pages/presentation.php:426
1882	msgid "Product Page Settings"
1883	msgstr ""
1884
1885	+ #: wpsc-admin/includes/settings-pages/presentation.php:429
1886	msgid "Product Display"
1887	msgstr ""
1888
1889	+ #: wpsc-admin/includes/settings-pages/presentation.php:506
1890	msgid "Purchase unavailable options"
1891	msgstr ""
1892
1893	+ #: wpsc-admin/includes/settings-pages/presentation.php:516
1894	msgid "Products Per Row"
1895	msgstr ""
1896
1897	+ #: wpsc-admin/includes/settings-pages/presentation.php:520
1898	msgid "Show images only"
1899	msgstr ""
1900
1901	+ #: wpsc-admin/includes/settings-pages/presentation.php:524

1902	msgid "Display Variations"
1903	msgstr ""
1904
1905	+ #: wpsc-admin/includes/settings-pages/presentation.php:528
1906	msgid "Display Description"
1907	msgstr ""
1908
1909	+ #: wpsc-admin/includes/settings-pages/presentation.php:532
1910	msgid "Display \"Add To Cart\" Button"
1911	msgstr ""
1912
1913	+ #: wpsc-admin/includes/settings-pages/presentation.php:536
1914	msgid "Display \"More Details\" Button"
1915	msgstr ""
1916
1917	+ #: wpsc-admin/includes/settings-pages/presentation.php:551
1918	msgid "Show list of categories"
1919	msgstr ""
1920
1921	+ #: wpsc-admin/includes/settings-pages/presentation.php:560
1922	msgid "Select what product category you want to display on the products page"
1923	msgstr ""
1924
1925	+ #: wpsc-admin/includes/settings-pages/presentation.php:588
1926	msgid "Sort Product By"
1927	msgstr ""
1928
1929	+ #: wpsc-admin/includes/settings-pages/presentation.php:597
1930	msgid "Drag & Drop"
1931	msgstr ""
1932
1933	+ #: wpsc-admin/includes/settings-pages/presentation.php:599
1934	msgid "Time Uploaded"
1935	msgstr ""
1936
1937	+ #: wpsc-admin/includes/settings-pages/presentation.php:605
1938	msgid "Show Breadcrumbs"
1939	msgstr ""
1940
1941	+ #: wpsc-admin/includes/settings-pages/presentation.php:630
1942	msgid "Product Groups/Products Display"
1943	msgstr ""
1944
1945	+ #: wpsc-admin/includes/settings-pages/presentation.php:647
1946	msgid "Product Groups Only (All products displayed)"
1947	msgstr ""
1948
1949	+ #: wpsc-admin/includes/settings-pages/presentation.php:648
1950	msgid "Sliding Product Groups (1 product per page)"
1951	msgstr ""
1952
1953	+ #: wpsc-admin/includes/settings-pages/presentation.php:654
1954	msgid "Show Subcategory Products in Parent Category"
1955	msgstr ""
1956
1957	+ #: wpsc-admin/includes/settings-pages/presentation.php:679
1958	msgid "Show Search"
1959	msgstr ""
1960
1961	+ #: wpsc-admin/includes/settings-pages/presentation.php:720
1962	msgid "Show Advanced Search"
1963	msgstr ""
1964
1965	+ #: wpsc-admin/includes/settings-pages/presentation.php:723
1966	msgid "Use Live Search"
1967	msgstr ""
1968
1969	+ #: wpsc-admin/includes/settings-pages/presentation.php:733
1970	msgid "Replace Page Title With Product/Category Name"
1971	msgstr ""
1972
1973	+ #: wpsc-admin/includes/settings-pages/presentation.php:754
1974	msgid "Display Featured Product above Product Pages"
1975	msgstr ""
1976
1977	+ #: wpsc-admin/includes/settings-pages/presentation.php:777
1978	msgid "Shopping Cart Settings"
1979	msgstr ""
1980
1981	+ #: wpsc-admin/includes/settings-pages/presentation.php:780
1982	+ msgid "Cart Location"
1983	+ msgstr ""
1984	+
1985	+ #: wpsc-admin/includes/settings-pages/presentation.php:806
1986	msgid "Page"
1987	msgstr ""
1988
1989	+ #: wpsc-admin/includes/settings-pages/presentation.php:810
1990	+ #: wpsc-admin/includes/settings-pages/presentation.php:814
1991	msgid "Widget"
1992	msgstr ""
1993
1994	+ #: wpsc-admin/includes/settings-pages/presentation.php:814
1995	+ #: wpsc-admin/includes/settings-pages/presentation.php:824
1996	msgid "You need to enable the widgets plugin to use this"
1997	msgstr ""
1998

1999	#: wpsc-admin/includes/settings-pages/presentation.php:820
2000	+ #: wpsc-admin/includes/settings-pages/presentation.php:825
2001	#: wpsc-admin/display-upgrades.page.php:22
2002	msgid "DropShop"
2003	msgstr ""
2004
2005	+ #: wpsc-admin/includes/settings-pages/presentation.php:824
2006	+ #: wpsc-admin/includes/settings-pages/presentation.php:825
2007	msgid "You need to install the Gold and DropShop extentions to use this"
2008	msgstr ""
2009
2010	+ #: wpsc-admin/includes/settings-pages/presentation.php:830
2011	msgid "Manual"
2012	msgstr ""
2013
2014	+ #: wpsc-admin/includes/settings-pages/presentation.php:839
2015	msgid "Show Dropshop on every page"
2016	msgstr ""
2017
2018	+ #: wpsc-admin/includes/settings-pages/presentation.php:842
2019	msgid "Show Dropshop only on product page"
2020	msgstr ""
2021
2022	+ #: wpsc-admin/includes/settings-pages/presentation.php:847
2023	msgid "Use light Dropshop style"
2024	msgstr ""
2025
2026	+ #: wpsc-admin/includes/settings-pages/presentation.php:850
2027	msgid "Use dark Dropshop style"
2028	msgstr ""
2029
2030	+ #: wpsc-admin/includes/settings-pages/presentation.php:853
2031	msgid "Crafty"
2032	msgstr ""
2033
2034	+ #: wpsc-admin/includes/settings-pages/presentation.php:862
2035	msgid "Display \"+ Postage & Tax\""
2036	msgstr ""
2037
2038	+ #: wpsc-admin/includes/settings-pages/presentation.php:885
2039	+ msgid "Product Category Settings"
2040	msgstr ""
2041
2042	+ #: wpsc-admin/includes/settings-pages/presentation.php:889
2043	+ msgid "Show Product Category Description"
2044	msgstr ""
2045
2046	+ #: wpsc-admin/includes/settings-pages/presentation.php:913
2047	+ msgid "Show Product Category Thumbnails"
2048	msgstr ""
2049
2050	+ #: wpsc-admin/includes/settings-pages/presentation.php:939
2051	+ msgid "Show Product Count per Product Category"
2052	msgstr ""
2053
2054	+ #: wpsc-admin/includes/settings-pages/presentation.php:988
2055	msgid "Thumbnail Settings"
2056	msgstr ""
2057
2058	+ #: wpsc-admin/includes/settings-pages/presentation.php:989
2059	msgid ""
2060	"Note: Anytime you update any of the thumbnail settings, WPeC will "
2061	"automatically resize all of your thumbnails for you. Depending on how many "
2062	"images you have, this could take awhile."
2063	msgstr ""
2064
2065	+ #: wpsc-admin/includes/settings-pages/presentation.php:993
2066	+ #: wpsc-admin/includes/display-items-functions.php:1011
2067	msgid "Default Product Thumbnail Size"
2068	msgstr ""
2069
2070	+ #: wpsc-admin/includes/settings-pages/presentation.php:1002
2071	msgid "Default Product Group Thumbnail Size"
2072	msgstr ""
2073
2074	+ #: wpsc-admin/includes/settings-pages/presentation.php:1011
2075	+ #: wpsc-admin/includes/display-items-functions.php:1011
2076	msgid "Single Product Image Size"
2077	msgstr ""
2078
2079	+ #: wpsc-admin/includes/settings-pages/presentation.php:1034
2080	msgid "Crop Thumbnails"
2081	msgstr ""
2082
2083	+ #: wpsc-admin/includes/settings-pages/presentation.php:1039
2084	msgid ""
2085	"Choosing \"Yes\" means that thumbnails are cropped to exact dimensions "
2086	"(normally thumbnails are proportional)"
2087	msgstr ""
2088
2089	+ #: wpsc-admin/includes/settings-pages/presentation.php:1068
2090	msgid "Use Lightbox Effect for product images"
2091	msgstr ""
2092
2093	+ #: wpsc-admin/includes/settings-pages/presentation.php:1086
2094	msgid ""
2095	"Using lightbox means that when clicking on a product image, a larger version "
2096	"will be displayed in a \"lightbox\" style window. If you are using a plugin "
2097	"such as Shutter Reloaded, you may want to disable lightbox."
2098	msgstr ""
2099
2100	+ #: wpsc-admin/includes/settings-pages/presentation.php:1090
2101	msgid "Lightbox script to use"
2102	msgstr ""
2103
2104	+ #: wpsc-admin/includes/settings-pages/presentation.php:1101
2105	msgid "Colorbox"
2106	msgstr ""
2107
2108	+ #: wpsc-admin/includes/settings-pages/presentation.php:1102
2109	msgid "Thickbox"
2110	msgstr ""
2111
2112	+ #: wpsc-admin/includes/settings-pages/presentation.php:1111
2113	msgid "Show Thumbnail Gallery"
2114	msgstr ""
2115
2116	+ #: wpsc-admin/includes/settings-pages/presentation.php:1135
2117	msgid "Gallery Thumbnail Image Size"
2118	msgstr ""
2119
2120	+ #: wpsc-admin/includes/settings-pages/presentation.php:1150
2121	msgid "Pagination settings"
2122	msgstr ""
2123
2124	+ #: wpsc-admin/includes/settings-pages/presentation.php:1154
2125	msgid "Use Pagination"
2126	msgstr ""
2127
2128	+ #: wpsc-admin/includes/settings-pages/presentation.php:1176
2129	msgid "number of products to show per page"
2130	msgstr ""
2131
2132	+ #: wpsc-admin/includes/settings-pages/presentation.php:1183
2133	msgid "Page Number position"
2134	msgstr ""
2135
2136	+ #: wpsc-admin/includes/settings-pages/presentation.php:1188
2137	msgid "Top"
2138	msgstr ""
2139
2140	+ #: wpsc-admin/includes/settings-pages/presentation.php:1191
2141	msgid "Bottom"
2142	msgstr ""
2143
2144	+ #: wpsc-admin/includes/settings-pages/presentation.php:1194
2145	msgid "Both"
2146	msgstr ""
2147
2148	+ #: wpsc-admin/includes/settings-pages/presentation.php:1201
2149	msgid "Comment Settings"
2150	msgstr ""
2151
2152	+ #: wpsc-admin/includes/settings-pages/presentation.php:1205
2153	msgid "Use IntenseDebate Comments"
2154	msgstr ""
2155
2156	+ #: wpsc-admin/includes/settings-pages/presentation.php:1229
2157	msgid "IntenseDebate Account ID"
2158	msgstr ""
2159
2160	+ #: wpsc-admin/includes/settings-pages/presentation.php:1231
2161	msgid "Help on finding the Account ID"
2162	msgstr ""
2163
2164	+ #: wpsc-admin/includes/settings-pages/presentation.php:1240
2165	msgid "By Default Display Comments on"
2166	msgstr ""
2167
2168	+ #: wpsc-admin/includes/settings-pages/presentation.php:1247
2169	+ msgid "All Products"
2170	+ msgstr ""
2171	+
2172	+ #: wpsc-admin/includes/settings-pages/presentation.php:1250
2173	+ msgid "Per Product"
2174	+ msgstr ""
2175	+
2176	#: wpsc-admin/includes/settings-pages/admin.php:7
2177	msgid "Admin Settings"
2178	msgstr ""

2208	msgid "Purchase Receipt - Reply Name"
2209	msgstr ""
2210
2211	+ #: wpsc-admin/includes/settings-pages/admin.php:102
2212	+ msgid "Terms and Conditions"
2213	+ msgstr ""
2214	+
2215	#: wpsc-admin/includes/settings-pages/admin.php:110
2216	msgid "Custom Messages"
2217	msgstr ""

2220	msgid "Tags can be used"
2221	msgstr ""
2222
2223	+ #: wpsc-admin/includes/settings-pages/admin.php:118
2224	+ msgid ""
2225	+ "Note: The purchase receipt is the message e-mailed to users after purchasing "
2226	+ "products from your shop."
2227	+ msgstr ""
2228	+
2229	+ #: wpsc-admin/includes/settings-pages/admin.php:129
2230	+ msgid ""
2231	+ "Note: The Admin Report is the email sent to the e-mail address set above as "
2232	+ "soon as someone successfully buys a product."
2233	+ msgstr ""
2234	+
2235	#: wpsc-admin/includes/settings-pages/admin.php:134
2236	msgid "Admin Report"
2237	msgstr ""

2240	msgid "Track and Trace settings"
2241	msgstr ""
2242
2243	+ #: wpsc-admin/includes/settings-pages/admin.php:144
2244	+ msgid ""
2245	+ "Note: The Tracking Subject, is the subject for The Tracking Message email. "
2246	+ "The Tracking Message is the message e-mailed to users when you click 'Email "
2247	+ "buyer' on the sales log. This option is only available for purchases with "
2248	+ "the status of 'Job Dispatched'. Tags you can use in the email message "
2249	+ "section are %trackid% and %shop_name%"
2250	+ msgstr ""
2251	+
2252	#: wpsc-admin/includes/settings-pages/admin.php:149
2253	msgid "Tracking Email Subject"
2254	msgstr ""

2265	"quantity, is limited quantity</p>"
2266	msgstr ""
2267
2268	+ #: wpsc-admin/includes/settings-pages/import.php:39
2269	+ msgid ""
2270	+ "For each column, select the field it corresponds to in 'Belongs to'. You can "
2271	+ "upload as many products as you like."
2272	+ msgstr ""
2273	+
2274	+ #: wpsc-admin/includes/settings-pages/import.php:44
2275	+ msgid "Product Status"
2276	+ msgstr ""
2277	+
2278	+ #: wpsc-admin/includes/settings-pages/import.php:48
2279	+ msgid ""
2280	+ "Select if you would like to import your products in as Drafts or Publish "
2281	+ "them right away."
2282	+ msgstr ""
2283	+
2284	+ #: wpsc-admin/includes/settings-pages/import.php:52
2285	+ msgid "Publish"
2286	+ msgstr ""
2287	+
2288	+ #: wpsc-admin/includes/settings-pages/import.php:53
2289	+ msgid "Draft"
2290	+ msgstr ""
2291	+
2292	+ #: wpsc-admin/includes/settings-pages/import.php:64
2293	+ msgid "Column (%s)"
2294	+ msgstr ""
2295	+
2296	+ #: wpsc-admin/includes/settings-pages/import.php:78
2297	+ msgid "Product Name"
2298	+ msgstr ""
2299	+
2300	+ #: wpsc-admin/includes/settings-pages/import.php:79
2301	+ #: wpsc-admin/includes/display-items-functions.php:708
2302	+ msgid "Description"
2303	+ msgstr ""
2304	+
2305	+ #: wpsc-admin/includes/settings-pages/import.php:80 wpsc-admin/admin.php:306
2306	+ msgid "Additional Description"
2307	+ msgstr ""
2308	+
2309	+ #: wpsc-admin/includes/settings-pages/import.php:82
2310	+ #: wpsc-admin/includes/products.php:78 wpsc-admin/display-items.page.php:49
2311	+ #: wpsc-admin/display-items.page.php:62 wpsc-admin/display-items.page.php:78
2312	+ #: wpsc-admin/display-sales-logs.php:135
2313	+ msgid "SKU"
2314	+ msgstr ""
2315	+
2316	+ #: wpsc-admin/includes/settings-pages/import.php:83
2317	+ #: wpsc-admin/includes/display-items-functions.php:569
2318	+ #: wpsc-admin/includes/products.php:78 wpsc-admin/display-items.page.php:45
2319	+ #: wpsc-admin/display-items.page.php:74
2320	+ msgid "Weight"
2321	+ msgstr ""
2322	+
2323	+ #: wpsc-admin/includes/settings-pages/import.php:84
2324	+ msgid "Weight Unit"
2325	+ msgstr ""
2326	+
2327	+ #: wpsc-admin/includes/settings-pages/import.php:85
2328	+ msgid "Stock Quantity"
2329	+ msgstr ""
2330	+
2331	+ #: wpsc-admin/includes/settings-pages/import.php:86
2332	+ msgid "Stock Quantity Limit"
2333	+ msgstr ""
2334	+
2335	+ #: wpsc-admin/includes/settings-pages/import.php:93
2336	+ msgid ""
2337	+ "Please select a category you would like to place all products from this CSV "
2338	+ "into"
2339	+ msgstr ""
2340	+
2341	+ #: wpsc-admin/includes/settings-pages/import.php:105
2342	+ msgid "There was an error while uploading your csv file."
2343	+ msgstr ""
2344	+
2345	+ #: wpsc-admin/includes/settings-pages/import.php:166
2346	+ msgid "Success, your <a href='%s'>products</a> have been upload."
2347	+ msgstr ""
2348	+
2349	+ #: wpsc-admin/includes/settings-pages/checkout.php:9
2350	+ msgid "Drag"
2351	+ msgstr ""
2352	+
2353	+ #: wpsc-admin/includes/settings-pages/checkout.php:11
2354	+ msgid "Type"
2355	+ msgstr ""
2356	+
2357	+ #: wpsc-admin/includes/settings-pages/checkout.php:12
2358	+ msgid "Unique Names"
2359	+ msgstr ""
2360	+
2361	+ #: wpsc-admin/includes/settings-pages/checkout.php:13
2362	+ msgid "Mandatory"
2363	+ msgstr ""
2364	+
2365	+ #: wpsc-admin/includes/settings-pages/checkout.php:14
2366	+ msgid "Trash"
2367	+ msgstr ""
2368	+
2369	#: wpsc-admin/includes/settings-pages/checkout.php:35
2370	msgid "Users must register before checking out"
2371	msgstr ""

2414	msgstr ""
2415
2416	#: wpsc-admin/includes/settings-pages/checkout.php:134

2417	msgid "Add"
2418	msgstr ""
2419
2420	+ #: wpsc-admin/includes/settings-pages/checkout.php:170
2421	+ msgid "Click and Drag to Order Checkout Fields"
2422	+ msgstr ""
2423	+
2424	+ #: wpsc-admin/includes/settings-pages/checkout.php:185
2425	+ msgid "more options"
2426	+ msgstr ""
2427	+
2428	+ #: wpsc-admin/includes/settings-pages/checkout.php:190
2429	+ #: wpsc-admin/admin.php:372
2430	+ msgid "Select a Unique Name"
2431	+ msgstr ""
2432	+
2433	+ #: wpsc-admin/includes/settings-pages/checkout.php:205
2434	+ #: wpsc-admin/includes/display-items-functions.php:699
2435	+ #: wpsc-admin/includes/products.php:385 wpsc-admin/admin.php:396
2436	+ #: wpsc-admin/admin-form-functions.php:68
2437	+ #: wpsc-admin/admin-form-functions.php:86 wpsc-admin/display-sales-logs.php:55
2438	+ #: wpsc-admin/display-sales-logs.php:294 wpsc-admin/ajax-and-init.php:1327
2439	+ #: wpsc-taxes/controllers/taxes_controller.class.php:612
2440	+ #: wpsc-shipping/tablerate.php:66 wpsc-shipping/weightrate.php:58
2441	+ msgid "Delete"
2442	+ msgstr ""
2443	+
2444	#: wpsc-admin/includes/settings-pages/checkout.php:208
2445	msgid "This will be the Email address that the Purchase Reciept is sent to."
2446	msgstr ""

2530	"The Target Markets feature has been disabled because you have the Suhosin "
2531	"PHP extension installed on this server. If you need to use the Target "
2532	"Markets feature then disable the suhosin extension, if you can not do this, "
2533	+ "you will need to contact your hosting provider."

2534	msgstr ""
2535
2536	+ #: wpsc-admin/includes/settings-pages/general.php:84
2537	msgid "Currency Settings"
2538	msgstr ""
2539
2540	+ #: wpsc-admin/includes/settings-pages/general.php:87
2541	msgid "Currency Type"
2542	msgstr ""
2543
2544	+ #: wpsc-admin/includes/settings-pages/general.php:112
2545	msgid "Currency Sign Location"
2546	msgstr ""
2547
2548	+ #: wpsc-admin/includes/settings-pages/general.php:148
2549	msgid "Thousands and decimal separators"
2550	msgstr ""
2551
2552	+ #: wpsc-admin/includes/settings-pages/general.php:150
2553	msgid "Thousands separator"
2554	msgstr ""
2555
2556	+ #: wpsc-admin/includes/settings-pages/general.php:151
2557	msgid "Decimal separator"
2558	msgstr ""
2559
2560	+ #: wpsc-admin/includes/settings-pages/general.php:152
2561	+ msgid "Preview:"

2562	msgstr ""
2563
2564	#: wpsc-admin/includes/settings-pages/taxes.php:12

2620	msgid "Tax Rates"
2621	msgstr ""
2622
2623	+ #: wpsc-admin/includes/settings-pages/taxes.php:145





2624	msgid "Add New Tax Rate"
2625	msgstr ""
2626
2627	+ #: wpsc-admin/includes/settings-pages/taxes.php:150
2628	msgid "Tax Bands"
2629	msgstr ""
2630
2631	+ #: wpsc-admin/includes/settings-pages/taxes.php:154
2632	msgid ""
2633	"Note: Tax Bands are special tax rules you can create and apply on a per-"
2634	"product basis. <br /> Please visit the product page to apply your Tax Band."
2635	msgstr ""
2636
2637	+ #: wpsc-admin/includes/settings-pages/taxes.php:158
2638	msgid ""
2639	"Note: Tax Bands do not take affect when product prices are tax exclusive."
2640	msgstr ""
2641
2642	+ #: wpsc-admin/includes/settings-pages/taxes.php:171
2643	msgid "Add New Tax Band"
2644	msgstr ""
2645

2687	msgid "Enable Free Shipping Discount"
2688	msgstr ""
2689
2690	+ #: wpsc-admin/includes/settings-pages/shipping.php:152
2691	+ msgid ""
2692	+ "Sales over or equal to: %1$s<input type=\"text\" size=\"6\" name="
2693	+ "\"wpsc_options[shipping_discount_value]\" value=\"%2$s\" id="
2694	+ "\"shipping_discount_value\" /> will receive free shipping."
2695	+ msgstr ""
2696	+
2697	+ #: wpsc-admin/includes/settings-pages/shipping.php:176
2698	msgid "Shipping Modules"
2699	msgstr ""
2700
2701	+ #: wpsc-admin/includes/settings-pages/shipping.php:180
2702	msgid ""
2703	"To enable shipping in WP e-Commerce you must select which shipping methods "
2704	"you want to enable on your site.<br /> If you want to use fixed-price "

2708	"\">Simple shipping</a>. It will appear in the list as \"Fixed rate\"."
2709	msgstr ""
2710
2711	+ #: wpsc-admin/includes/settings-pages/shipping.php:184
2712	msgid "Internal Shipping Calculators"
2713	msgstr ""
2714
2715	+ #: wpsc-admin/includes/settings-pages/shipping.php:206
2716	msgid "External Shipping Calculators"
2717	msgstr ""
2718
2719	+ #: wpsc-admin/includes/settings-pages/shipping.php:209
2720	msgid ""
2721	"The following shipping modules all need cURL which is not installed on this "
2722	"server, you may need to contact your web hosting provider to get it set up. "

2744	msgid "GST/Tax Rate"
2745	msgstr ""
2746
2747	+ #: wpsc-admin/includes/display-items-functions.php:132
2748	+ msgid ""
2749	+ "This Product has variations, to edit the price please use the <a href="
2750	+ "\"#variation_control\">Variation Controls</a> below."
2751	msgstr ""
2752
2753	+ #: wpsc-admin/includes/display-items-functions.php:133
2754	+ msgid "Price: %s and above."
2755	+ msgstr ""

















2756
2757	+ #: wpsc-admin/includes/display-items-functions.php:142
2758	+ #: wpsc-admin/includes/products.php:78 wpsc-admin/display-items.page.php:48
2759	+ #: wpsc-admin/display-items.page.php:61 wpsc-admin/display-items.page.php:77
2760	+ msgid "Sale Price"
2761	msgstr ""
2762
2763	+ #: wpsc-admin/includes/display-items-functions.php:149
2764	+ msgid "+ New Currency"
2765	msgstr ""
2766
2767	+ #: wpsc-admin/includes/display-items-functions.php:153
2768	+ #: wpsc-admin/includes/display-items-functions.php:173
2769	+ msgid "Currency type"
2770	msgstr ""
2771
2772	+ #: wpsc-admin/includes/display-items-functions.php:185
2773	+ #: wpsc-admin/includes/display-items-functions.php:1263
2774	+ msgid "Price:"
2775	msgstr ""
2776
2777	+ #: wpsc-admin/includes/display-items-functions.php:192
2778	+ msgid "This is a donation, checking this box populates the donations widget."

2779	msgstr ""
2780
2781	+ #: wpsc-admin/includes/display-items-functions.php:195
2782	+ msgid "Table Rate Price"
2783	msgstr ""
2784
2785	+ #: wpsc-admin/includes/display-items-functions.php:197
2786	+ msgid "+ Add level"


2787	msgstr ""
2788
2789	+ #: wpsc-admin/includes/display-items-functions.php:201
2790	+ msgid "Quantity In Cart"
2791	msgstr ""
2792
2793	+ #: wpsc-admin/includes/display-items-functions.php:202
2794	+ msgid "Discounted Price"
2795	msgstr ""
2796
2797	+ #: wpsc-admin/includes/display-items-functions.php:212
2798	+ #: wpsc-admin/includes/display-items-functions.php:225
2799	+ msgid "and above"
2800	msgstr ""
2801
2802	+ #: wpsc-admin/includes/display-items-functions.php:249
2803	+ msgid "Stock Keeping Unit"

2804	msgstr ""
2805
2806	+ #: wpsc-admin/includes/display-items-functions.php:249
2807	+ #: wpsc-admin/includes/display-items-functions.php:1239
2808	+ msgid "SKU:"
2809	msgstr ""
2810
2811	+ #: wpsc-admin/includes/display-items-functions.php:259
2812	+ msgid "I have limited stock for this Product"

2813	msgstr ""
2814
2815	+ #: wpsc-admin/includes/display-items-functions.php:269
2816	msgid ""
2817	+ "This Product has variations, to edit the quantity please use the Variation "
2818	+ "Controls below."
2819	msgstr ""
2820
2821	+ #: wpsc-admin/includes/display-items-functions.php:270
2822	+ msgid "%s variant item in stock."
2823	+ msgid_plural "%s variant items in stock."
2824	+ msgstr[0] ""
2825	+ msgstr[1] ""
2826
2827	+ #: wpsc-admin/includes/display-items-functions.php:272
2828	+ msgid "Quantity:"


2829	msgstr ""
2830
2831	+ #: wpsc-admin/includes/display-items-functions.php:280
2832	+ msgid "%s of them is reserved for pending or recently completed orders."
2833	+ msgid_plural ""
2834	+ "%s of them are reserved for pending or recently completed orders."
2835	+ msgstr[0] ""
2836	+ msgstr[1] ""
2837	+
2838	+ #: wpsc-admin/includes/display-items-functions.php:287
2839	+ msgid "Notify site owner and unpublish this Product if stock runs out"
2840	msgstr ""
2841
2842	+ #: wpsc-admin/includes/display-items-functions.php:289
2843	+ msgid ""
2844	+ "If stock runs out, this Product will not be available on the shop unless you "
2845	+ "untick this box or add more stock."
2846	msgstr ""
2847
2848	+ #: wpsc-admin/includes/display-items-functions.php:293
2849	+ msgid "Stock Qty"
2850	msgstr ""
2851
2852	+ #: wpsc-admin/includes/display-items-functions.php:295
2853	+ msgid ""
2854	+ "If this Product runs out of stock set status to Unpublished & email site "
2855	+ "owner"


2856	msgstr ""
2857
2858	+ #: wpsc-admin/includes/display-items-functions.php:326
2859	+ #: wpsc-taxes/controllers/taxes_controller.class.php:308
2860	+ msgid "Custom Tax Band"
2861	msgstr ""
2862
2863	+ #: wpsc-admin/includes/display-items-functions.php:338
2864	+ msgid "This product is not taxable."
2865	msgstr ""
2866
2867	+ #: wpsc-admin/includes/display-items-functions.php:350
2868	+ msgid "Taxable Amount"


2869	msgstr ""
2870
2871	+ #: wpsc-admin/includes/display-items-functions.php:396
2872	+ msgid "You must first save this Product as a Draft before adding variations"






2873	msgstr ""
2874
2875	+ #: wpsc-admin/includes/display-items-functions.php:448
2876	+ msgid "Update Variations →"
2877	msgstr ""
2878
2879	+ #: wpsc-admin/includes/display-items-functions.php:479
2880	msgid ""
2881	+ "Check or uncheck variation boxes and then click Update Variations to add or "
2882	+ "remove variations."
2883	msgstr ""
2884
2885	+ #: wpsc-admin/includes/display-items-functions.php:503
2886	+ msgid "You have no Variations added."
2887	msgstr ""
2888
2889	+ #: wpsc-admin/includes/display-items-functions.php:574
2890	+ msgid "Pounds"


2891	msgstr ""
2892
2893	+ #: wpsc-admin/includes/display-items-functions.php:575
2894	+ msgid "Ounces"

2895	msgstr ""
2896
2897	+ #: wpsc-admin/includes/display-items-functions.php:576
2898	+ msgid "Grams"
2899	msgstr ""
2900
2901	+ #: wpsc-admin/includes/display-items-functions.php:577
2902	+ msgid "Kilograms"
2903	msgstr ""
2904
2905	+ #: wpsc-admin/includes/display-items-functions.php:589
2906	+ #: wpsc-admin/includes/display-items-functions.php:602
2907	+ #: wpsc-admin/includes/display-items-functions.php:615
2908	+ msgid "inches"
2909	msgstr ""
2910
2911	+ #: wpsc-admin/includes/display-items-functions.php:590
2912	+ #: wpsc-admin/includes/display-items-functions.php:603
2913	+ #: wpsc-admin/includes/display-items-functions.php:616
2914	+ msgid "cm"
2915	msgstr ""
2916
2917	+ #: wpsc-admin/includes/display-items-functions.php:591
2918	+ #: wpsc-admin/includes/display-items-functions.php:604
2919	+ #: wpsc-admin/includes/display-items-functions.php:617
2920	+ msgid "meter"
2921	msgstr ""
2922
2923	+ #: wpsc-admin/includes/display-items-functions.php:610
2924	msgid "Length"
2925	msgstr ""
2926
2927	+ #: wpsc-admin/includes/display-items-functions.php:626
2928	msgid "Flat Rate Settings"
2929	msgstr ""
2930
2931	+ #: wpsc-admin/includes/display-items-functions.php:631
2932	msgid "Local Shipping Fee"
2933	msgstr ""
2934
2935	+ #: wpsc-admin/includes/display-items-functions.php:640
2936	msgid "International Shipping Fee"
2937	msgstr ""
2938
2939	+ #: wpsc-admin/includes/display-items-functions.php:649
2940	msgid "Disregard Shipping for this Product"
2941	msgstr ""
2942
2943	+ #: wpsc-admin/includes/display-items-functions.php:686
2944	msgid "Custom Meta"
2945	msgstr ""
2946
2947	+ #: wpsc-admin/includes/display-items-functions.php:687
2948	msgid "Add Custom Meta"
2949	msgstr ""
2950
2951	+ #: wpsc-admin/includes/display-items-functions.php:697
2952	+ #: wpsc-admin/admin-form-functions.php:77
2953	msgid "Value"
2954	msgstr ""
2955
2956	+ #: wpsc-admin/includes/display-items-functions.php:715
2957	+ msgid "Merchant Notes:"
2958	msgstr ""
2959
2960	+ #: wpsc-admin/includes/display-items-functions.php:722
2961	msgid "These notes are only available here."
2962	msgstr ""
2963
2964	+ #: wpsc-admin/includes/display-items-functions.php:727
2965	msgid "Personalisation Options"
2966	msgstr ""
2967
2968	+ #: wpsc-admin/includes/display-items-functions.php:730
2969	msgid ""
2970	"Users can personalize this Product by leaving a message on single product "
2971	"page"
2972	msgstr ""
2973
2974	+ #: wpsc-admin/includes/display-items-functions.php:738
2975	msgid "Users can upload images on single product page to purchase logs."
2976	msgstr ""
2977
2978	+ #: wpsc-admin/includes/display-items-functions.php:749
2979	+ msgid ""
2980	+ "Prohibited <a href=\"http://checkout.google.com/support/sell/bin/answer.py?"
2981	+ "answer=75724\">by Google?</a>"
2982	msgstr ""
2983
2984	+ #: wpsc-admin/includes/display-items-functions.php:762
2985	msgid "Enable Comments"
2986	msgstr ""
2987
2988	+ #: wpsc-admin/includes/display-items-functions.php:764
2989	+ msgid "Use Default"
2990	+ msgstr ""
2991	+
2992	+ #: wpsc-admin/includes/display-items-functions.php:768
2993	msgid "Allow users to comment on this Product."
2994	msgstr ""
2995
2996	+ #: wpsc-admin/includes/display-items-functions.php:792
2997	msgid ""
2998	"If this product is for sale on another website enter the link here. For "
2999	"instance if your product is an MP3 file for sale on iTunes you could put the "

3002	"choose to open the link in a new window."
3003	msgstr ""
3004
3005	+ #: wpsc-admin/includes/display-items-functions.php:796
3006	msgid "External Link"
3007	msgstr ""
3008
3009	+ #: wpsc-admin/includes/display-items-functions.php:800
3010	msgid "External Link Text"
3011	msgstr ""
3012
3013	+ #: wpsc-admin/includes/display-items-functions.php:804
3014	msgid "External Link Target"
3015	msgstr ""
3016
3017	+ #: wpsc-admin/includes/display-items-functions.php:807
3018	+ msgctxt "External product link target"
3019	+ msgid "Default (set by theme)"
3020	msgstr ""
3021
3022	+ #: wpsc-admin/includes/display-items-functions.php:808
3023	+ msgid "Open link in the same window"
3024	msgstr ""
3025
3026	+ #: wpsc-admin/includes/display-items-functions.php:809
3027	+ msgid "Open link in a new window"
3028	msgstr ""
3029
3030	+ #: wpsc-admin/includes/display-items-functions.php:825
3031	+ msgid "Manage Product Images"
3032	msgstr ""
3033
3034	+ #: wpsc-admin/includes/display-items-functions.php:846
3035	+ msgid "Upload New File"
3036	msgstr ""
3037
3038	+ #: wpsc-admin/includes/display-items-functions.php:847
3039	+ msgid "Max Upload Size"

3040	msgstr ""
3041
3042	+ #: wpsc-admin/includes/display-items-functions.php:848
3043	+ msgid "Select all downloadable files for %s"

3044	msgstr ""
3045
3046	+ #: wpsc-admin/includes/display-items-functions.php:848
3047	+ msgid "Select from existing files"

3048	msgstr ""
3049
3050	+ #: wpsc-admin/includes/display-items-functions.php:853
3051	+ msgid "Select an MP3 file to upload as a preview"

3052	msgstr ""
3053
3054	+ #: wpsc-admin/includes/display-items-functions.php:856
3055	+ msgid "Your preview for this product:"

3056	msgstr ""
3057
3058	+ #: wpsc-admin/includes/display-items-functions.php:890
3059	+ msgid "Upload Image%s"

3060	msgstr ""
3061
3062	+ #: wpsc-admin/includes/display-items-functions.php:944
3063	+ msgid "Variation set"

3064	msgstr ""
3065
3066	+ #: wpsc-admin/includes/display-items-functions.php:967
3067	+ #: wpsc-admin/includes/display-items-functions.php:997
3068	+ #: wpsc-admin/includes/display-items-functions.php:1120
3069	+ msgid "Use as Product Thumbnail"
3070	msgstr ""
3071
3072	+ #: wpsc-admin/includes/display-items-functions.php:973
3073	+ msgid ""
3074	+ "The name is how it appears on your site. <br><div class=\"error"
3075	+ "\"><strong>Please read this carefully before starting to work with "
3076	+ "variations:</strong><br />Variations in WP e-Commerce are divided into sets. "
3077	+ "For example set <strong>Color</strong> could have variations <strong>Red, "
3078	+ "Green,</strong> and <strong>Blue</strong>. To create a set simply enter "
3079	+ "<stron>Name</strong> and push Enter key on your keyboard or click "
3080	+ "<strong>Add New Variation/Set</strong> button in the bottom of this page. "
3081	+ "Now you can select the variation set that you've just created from "
3082	+ "<strong>Variation set</strong> drop-down menu and add some variations to it."
3083	+ "</div>"
3084	msgstr ""
3085
3086	+ #: wpsc-admin/includes/display-items-functions.php:996
3087	+ #: wpsc-admin/includes/display-items-functions.php:1119
3088	+ msgid "Use as featured image"
3089	msgstr ""
3090
3091	+ #: wpsc-admin/includes/display-items-functions.php:1011
3092	msgid "Full Size"
3093	msgstr ""
3094
3095	+ #: wpsc-admin/includes/display-items-functions.php:1031
3096	msgid "(%d × %d)"
3097	msgstr ""
3098
3099	+ #: wpsc-admin/includes/display-items-functions.php:1039
3100	msgid "Alt text for the product image, e.g. “Rockstar T-Shirt”"
3101	msgstr ""
3102
3103	+ #: wpsc-admin/includes/display-items-functions.php:1042
3104	+ msgid "Single Product Page Thumbnail:"
3105	msgstr ""
3106
3107	+ #: wpsc-admin/includes/display-items-functions.php:1045
3108	+ msgid ""
3109	+ "This is the Thumbnail size that will be displayed on the Single Product "
3110	+ "page. You can change the default sizes under your store settings"
3111	msgstr ""
3112
3113	+ #: wpsc-admin/includes/display-items-functions.php:1058
3114	+ msgid "Products Page Thumbnail Size:"
3115	+ msgstr ""
3116	+
3117	+ #: wpsc-admin/includes/display-items-functions.php:1060
3118	+ msgid "Custom thumbnail size for this image on the main Product Page"
3119	+ msgstr ""
3120	+
3121	+ #: wpsc-admin/includes/display-items-functions.php:1130
3122	msgid "Product Image Gallery"
3123	msgstr ""
3124
3125	+ #: wpsc-admin/includes/display-items-functions.php:1207
3126	+ #: wpsc-admin/includes/products.php:282 wpsc-admin/includes/products.php:325
3127	+ #: wpsc-admin/includes/product-functions.php:12
3128	+ #: wpsc-admin/includes/product-functions.php:59 wpsc-admin/admin.php:878
3129	+ #: wpsc-admin/admin.php:880 wpsc-admin/display-items.page.php:133
3130	+ #: wpsc-admin/display-items.page.php:177 wpsc-admin/display-items.page.php:209
3131	+ #: wpsc-admin/ajax-and-init.php:363 wpsc-includes/category.functions.php:56
3132	+ #: wpsc-includes/category.functions.php:328
3133	+ #: wpsc-includes/purchaselogs.class.php:326
3134	+ #: wpsc-includes/purchaselogs.class.php:856
3135	+ msgid "N/A"
3136	+ msgstr ""
3137	+
3138	+ #: wpsc-admin/includes/display-items-functions.php:1247
3139	+ msgid "Weight:"
3140	+ msgstr ""
3141	+
3142	+ #: wpsc-admin/includes/display-items-functions.php:1255
3143	+ msgid "Stock:"
3144	+ msgstr ""
3145	+
3146	+ #: wpsc-admin/includes/display-items-functions.php:1271
3147	+ msgid "Sale Price:"
3148	+ msgstr ""
3149	+
3150	+ #: wpsc-admin/includes/products.php:69
3151	msgid "(no title)"
3152	msgstr ""
3153
3154	+ #: wpsc-admin/includes/products.php:78 wpsc-admin/display-items.page.php:46
3155	+ #: wpsc-admin/display-items.page.php:59 wpsc-admin/display-items.page.php:75
3156	+ msgid "Stock"
3157	+ msgstr ""
3158	+
3159	#: wpsc-admin/includes/products.php:89
3160	msgid "Unpublished"
3161	msgstr ""

3188	msgid "Last Modified"
3189	msgstr ""
3190
3191	+ #: wpsc-admin/includes/products.php:131
3192	+ msgid "Edit “%s”"
3193	+ msgstr ""
3194	+
3195	+ #: wpsc-admin/includes/products.php:166
3196	msgid "Edit this product"
3197	msgstr ""
3198
3199	+ #: wpsc-admin/includes/products.php:167
3200	+ msgid "Quick Edit"
3201	+ msgstr ""
3202	+
3203	+ #: wpsc-admin/includes/products.php:172
3204	msgid "Preview “%s”"
3205	msgstr ""
3206
3207	+ #: wpsc-admin/includes/products.php:172
3208	+ msgid "Preview"
3209	+ msgstr ""
3210	+
3211	+ #: wpsc-admin/includes/products.php:175
3212	msgid "View “%s”"
3213	msgstr ""
3214
3215	+ #: wpsc-admin/includes/products.php:175 wpsc-admin/includes/products.php:369
3216	msgid "View"
3217	msgstr ""
3218
3219	+ #: wpsc-admin/includes/products.php:298 wpsc-admin/display-items.page.php:222
3220	msgid "Uncategorized"
3221	msgstr ""
3222
3223	+ #: wpsc-admin/includes/products.php:316
3224	msgid "No Tags"
3225	msgstr ""
3226
3227	+ #: wpsc-admin/includes/products.php:347
3228	msgid "%s pending"
3229	msgstr ""
3230
3231	#. translators: comment count link
3232	+ #: wpsc-admin/includes/products.php:350
3233	msgctxt "comment count"
3234	msgid "0"
3235	msgstr ""
3236
3237	#. translators: comment count link
3238	+ #: wpsc-admin/includes/products.php:350
3239	msgctxt "comment count"
3240	msgid "1"
3241	msgstr ""
3242
3243	#. translators: comment count link: % will be substituted by comment count
3244	+ #: wpsc-admin/includes/products.php:350
3245	msgctxt "comment count"
3246	msgid "%"
3247	msgstr ""
3248
3249	+ #: wpsc-admin/includes/product-functions.php:438







3250	msgid "Could not update product in the database"
3251	msgstr ""
3252
3253	+ #: wpsc-admin/includes/product-functions.php:455
3254	msgid "Could not insert product into the database"
3255	msgstr ""
3256

3258	msgid "Thanks, the coupon has been added."
3259	msgstr ""
3260
3261	+ #: wpsc-admin/display-coupons.php:139 wpsc-admin/admin.php:162
3262	msgid "Coupons"
3263	msgstr ""
3264
3265	+ #: wpsc-admin/display-coupons.php:141 wpsc-includes/purchaselogs.class.php:21
3266	+ msgid "Add New"
3267	+ msgstr ""
3268	+
3269	#: wpsc-admin/display-coupons.php:152 wpsc-admin/display-coupons.php:296
3270	#: wpsc-admin/admin-form-functions.php:13
3271	#: wpsc-admin/display-sales-logs.php:211

3297	msgid "Apply On All Products"
3298	msgstr ""
3299
3300	+ #: wpsc-admin/display-coupons.php:172 wpsc-admin/admin-form-functions.php:33
3301	msgid "Free shipping"
3302	msgstr ""
3303

3313	msgid "This coupon affects each product at checkout."
3314	msgstr ""
3315
3316	+ #: wpsc-admin/display-coupons.php:223 wpsc-admin/admin-form-functions.php:122
3317	msgid "Item name"
3318	msgstr ""
3319
3320	+ #: wpsc-admin/display-coupons.php:224 wpsc-admin/admin-form-functions.php:123
3321	msgid "Item quantity"
3322	msgstr ""
3323
3324	+ #: wpsc-admin/display-coupons.php:225 wpsc-admin/admin-form-functions.php:124
3325	msgid "Total quantity"
3326	msgstr ""
3327
3328	+ #: wpsc-admin/display-coupons.php:226 wpsc-admin/admin-form-functions.php:125
3329	msgid "Subtotal amount"
3330	msgstr ""
3331
3332	+ #: wpsc-admin/display-coupons.php:231 wpsc-admin/admin-form-functions.php:129
3333	msgid "Is equal to"
3334	msgstr ""
3335
3336	+ #: wpsc-admin/display-coupons.php:232 wpsc-admin/admin-form-functions.php:130
3337	msgid "Is greater than"
3338	msgstr ""
3339
3340	+ #: wpsc-admin/display-coupons.php:233 wpsc-admin/admin-form-functions.php:131
3341	msgid "Is less than"
3342	msgstr ""
3343
3344	+ #: wpsc-admin/display-coupons.php:234 wpsc-admin/admin-form-functions.php:132
3345	msgid "Contains"
3346	msgstr ""
3347
3348	+ #: wpsc-admin/display-coupons.php:235 wpsc-admin/admin-form-functions.php:133
3349	msgid "Does not contain"
3350	msgstr ""
3351
3352	+ #: wpsc-admin/display-coupons.php:236 wpsc-admin/admin-form-functions.php:134
3353	msgid "Begins with"
3354	msgstr ""
3355
3356	+ #: wpsc-admin/display-coupons.php:237 wpsc-admin/admin-form-functions.php:135
3357	msgid "Ends with"
3358	msgstr ""
3359

3365	msgid "Add New Condition"
3366	msgstr ""
3367
3368	+ #: wpsc-admin/display-coupons.php:342
3369	+ msgid "Free Shipping"
3370	+ msgstr ""
3371	+
3372	#: wpsc-admin/display-coupons.php:398
3373	msgid ""
3374	"<strong>Note:</strong> Due to a current PayPal limitation, when a purchase "

3377	"will see your shop name and the total within PayPal."
3378	msgstr ""
3379
3380	+ #: wpsc-admin/admin.php:152
3381	msgid "Store Sales"
3382	msgstr ""
3383
3384	+ #: wpsc-admin/admin.php:155
3385	msgid "Update Store"
3386	msgstr ""
3387
3388	+ #: wpsc-admin/admin.php:155
3389	msgid "Store Update"
3390	msgstr ""
3391
3392	+ #: wpsc-admin/admin.php:157
3393	msgid "Store Upgrades"
3394	msgstr ""
3395
3396	+ #: wpsc-admin/admin.php:165 wpsc-admin/display-options-settings.page.php:16
3397	msgid "Store Settings"
3398	msgstr ""
3399
3400	+ #: wpsc-admin/admin.php:165
3401	msgid "Store"
3402	msgstr ""
3403
3404	+ #: wpsc-admin/admin.php:170
3405	msgid "Store Debug"
3406	msgstr ""
3407
3408	+ #: wpsc-admin/admin.php:174
3409	msgid "For More Information"
3410	msgstr ""
3411
3412	+ #: wpsc-admin/admin.php:176
3413	+ msgid ""
3414	+ "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-"
3415	+ "store/sales/'>About the Sales Page</a>"
3416	+ msgstr ""
3417	+
3418	+ #: wpsc-admin/admin.php:177
3419	+ msgid ""
3420	+ "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-"
3421	+ "store/products'>About the Products Page</a>"
3422	+ msgstr ""
3423	+
3424	+ #: wpsc-admin/admin.php:178
3425	+ msgid ""
3426	+ "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-"
3427	+ "store/categories/'>About the Categories Page</a>"
3428	+ msgstr ""
3429	+
3430	+ #: wpsc-admin/admin.php:179
3431	+ msgid ""
3432	+ "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-"
3433	+ "store/variations/'>About the Variations Page</a>"
3434	+ msgstr ""
3435	+
3436	+ #: wpsc-admin/admin.php:180
3437	+ msgid ""
3438	+ "<a target='_blank' href='http://getshopped.org/resources/docs/store-settings/"
3439	+ "general/'>General Settings</a><br /> <a target='_blank' href='http://"
3440	+ "getshopped.org/resources/docs/store-settings/checkout/'>Checkout Options</a> "
3441	+ "<br />"
3442	+ msgstr ""
3443	+
3444	+ #: wpsc-admin/admin.php:181
3445	+ msgid ""
3446	+ "<a target='_blank' href='http://getshopped.org/resources/docs/building-your-"
3447	+ "store/marketing'>Marketing Options</a><br />"
3448	+ msgstr ""
3449	+
3450	+ #: wpsc-admin/admin.php:213
3451	msgid "Product Tracking Email"
3452	msgstr ""
3453
3454	+ #: wpsc-admin/admin.php:214
3455	msgid ""
3456	"Track & Trace means you may track the progress of your parcel with our "
3457	"online parcel tracker, just login to our website and enter the following "

3460	"Tracking ID: %trackid%\n"
3461	msgstr ""
3462
3463	+ #: wpsc-admin/admin.php:269 wpsc-admin/admin.php:342
3464	+ msgid ""
3465	+ "Unsaved changes have been detected. Click OK to lose these changes and "
3466	+ "continue."
3467	+ msgstr ""
3468	+
3469	+ #: wpsc-admin/admin.php:295
3470	+ msgid "Variations"
3471	+ msgstr ""
3472	+
3473	+ #: wpsc-admin/admin.php:296
3474	+ msgid "Off Site Product link"
3475	+ msgstr ""
3476	+
3477	+ #: wpsc-admin/admin.php:303
3478	+ msgid "Price Control"
3479	+ msgstr ""
3480	+
3481	+ #: wpsc-admin/admin.php:304
3482	+ msgid "Stock Control"
3483	+ msgstr ""
3484	+
3485	+ #: wpsc-admin/admin.php:305 wpsc-admin/display-sales-logs.php:221
3486	+ msgid "Taxes"
3487	+ msgstr ""
3488	+
3489	+ #: wpsc-admin/admin.php:307
3490	+ msgid "Product Download"
3491	+ msgstr ""
3492	+
3493	+ #: wpsc-admin/admin.php:308
3494	+ msgid "Product Images"
3495	+ msgstr ""
3496	+
3497	+ #: wpsc-admin/admin.php:397
3498	msgid "Text"
3499	msgstr ""
3500
3501	+ #: wpsc-admin/admin.php:400
3502	msgid "Textarea"
3503	msgstr ""
3504
3505	+ #: wpsc-admin/admin.php:401
3506	msgid "Heading"
3507	msgstr ""
3508
3509	+ #: wpsc-admin/admin.php:402
3510	msgid "Coupon"
3511	msgstr ""
3512
3513	+ #: wpsc-admin/admin.php:407
3514	+ msgid "Label"
3515	+ msgstr ""
3516	+
3517	+ #: wpsc-admin/admin.php:408
3518	+ msgid "Label Description"
3519	+ msgstr ""
3520	+
3521	+ #: wpsc-admin/admin.php:409
3522	+ msgid "Item Number"
3523	+ msgstr ""
3524	+
3525	+ #: wpsc-admin/admin.php:410
3526	+ msgid "Life Number"
3527	+ msgstr ""
3528	+
3529	+ #: wpsc-admin/admin.php:411
3530	+ msgid "Product Code"
3531	+ msgstr ""
3532	+
3533	+ #: wpsc-admin/admin.php:412
3534	+ msgid "PDF"
3535	+ msgstr ""
3536	+
3537	+ #: wpsc-admin/admin.php:414 wpsc-shipping/tablerate.php:61
3538	#: wpsc-shipping/weightrate.php:58
3539	msgid " and above"
3540	msgstr ""
3541
3542	+ #: wpsc-admin/admin.php:415 wpsc-shipping/tablerate.php:59
3543	msgid "If price is "
3544	msgstr ""
3545
3546	+ #: wpsc-admin/admin.php:416 wpsc-shipping/weightrate.php:58
3547	msgid "If weight is "
3548	msgstr ""
3549
3550	+ #: wpsc-admin/admin.php:472 wpsc-admin/admin-form-functions.php:203

3551	msgid "Current Month"
3552	msgstr ""
3553
3554	+ #: wpsc-admin/admin.php:485 wpsc-admin/admin.php:512
3555	+ msgctxt "the total value of sales in dashboard widget"
3556	+ msgid "Sales"
3557	msgstr ""
3558
3559	+ #: wpsc-admin/admin.php:491 wpsc-admin/admin.php:518
3560	+ #: wpsc-admin/admin-form-functions.php:297
3561	+ msgid "Order"
3562	+ msgid_plural "Orders"
3563	+ msgstr[0] ""
3564	+ msgstr[1] ""
3565	+
3566	+ #: wpsc-admin/admin.php:500 wpsc-admin/admin.php:529
3567	+ msgid "Avg Order"
3568	msgstr ""
3569
3570	+ #: wpsc-admin/admin.php:508
3571	msgid "Total Income"
3572	msgstr ""
3573
3574	+ #: wpsc-admin/admin.php:553
3575	msgid "Getshopped News"
3576	msgstr ""
3577
3578	+ #: wpsc-admin/admin.php:554
3579	msgid "Sales Summary"
3580	msgstr ""
3581
3582	+ #: wpsc-admin/admin.php:555
3583	msgid "Sales by Quarter"
3584	msgstr ""
3585
3586	+ #: wpsc-admin/admin.php:556
3587	msgid "Sales by Month"
3588	msgstr ""
3589
3590	+ #: wpsc-admin/admin.php:614
3591	msgid "Financial Year End"
3592	msgstr ""
3593
3594	+ #: wpsc-admin/admin.php:671 wpsc-admin/admin.php:773
3595	+ #: wpsc-admin/admin-form-functions.php:208
3596	msgid "At a Glance"
3597	msgstr ""
3598
3599	+ #: wpsc-admin/admin.php:672
3600	msgid "Revenue"
3601	msgstr ""
3602
3603	+ #: wpsc-admin/admin.php:770
3604	+ msgid "Last four months of sales on a per product basis:"

3605	msgstr ""
3606
3607	+ #: wpsc-admin/admin.php:842
3608	+ msgid "Error: you don't have required permissions to edit this product"

3609	msgstr ""
3610
3611	+ #: wpsc-admin/admin.php:885
3612	+ msgid "Error updating product"
3613	+ msgstr ""
3614	+
3615	+ #: wpsc-admin/display-items.page.php:50
3616	msgid "Categories"
3617	msgstr ""
3618
3619	+ #: wpsc-admin/display-items.page.php:51
3620	msgid "Featured"
3621	msgstr ""
3622

3624	msgid "Drag to a new position"
3625	msgstr ""
3626
3627	+ #: wpsc-admin/display-items.page.php:156
3628	+ msgid " lbs."
3629	+ msgstr ""
3630	+
3631	+ #: wpsc-admin/display-items.page.php:159
3632	+ msgid " oz."
3633	+ msgstr ""
3634	+
3635	+ #: wpsc-admin/display-items.page.php:162
3636	+ msgid " g"
3637	+ msgstr ""
3638	+
3639	+ #: wpsc-admin/display-items.page.php:166
3640	+ msgid " kgs."
3641	+ msgstr ""
3642	+
3643	+ #: wpsc-admin/display-items.page.php:230 wpsc-admin/display-items.page.php:356
3644	msgid "Unmark as Featured"
3645	msgstr ""
3646
3647	+ #: wpsc-admin/display-items.page.php:232 wpsc-admin/display-items.page.php:358
3648	msgid "Mark as Featured"
3649	msgstr ""
3650
3651	+ #: wpsc-admin/display-items.page.php:295
3652	+ msgctxt "Show all [category name]"
3653	+ msgid "Show All %s"
3654	+ msgstr ""
3655	+
3656	#: wpsc-admin/display-update.page.php:40
3657	msgid "WP e-Commerce is almost ready."
3658	msgstr ""

3667	msgid "Update WP e-Commerce"
3668	msgstr ""
3669
3670	+ #: wpsc-admin/display-update.page.php:60
3671	+ msgid "Updating Categories..."
3672	+ msgstr ""
3673	+
3674	+ #: wpsc-admin/display-update.page.php:62
3675	+ msgid "Updating Variations..."
3676	+ msgstr ""
3677	+
3678	+ #: wpsc-admin/display-update.page.php:64
3679	+ msgid "Updating Products..."
3680	+ msgstr ""
3681	+
3682	+ #: wpsc-admin/display-update.page.php:66
3683	+ msgid "Updating Child Products..."
3684	+ msgstr ""
3685	+
3686	+ #: wpsc-admin/display-update.page.php:68
3687	+ msgid "Updating Product Files..."
3688	+ msgstr ""
3689	+
3690	+ #: wpsc-admin/display-update.page.php:70
3691	+ msgid "Updating Database..."
3692	+ msgstr ""
3693	+
3694	+ #: wpsc-admin/display-update.page.php:73
3695	+ msgid "WP e-Commerce updated successfully!"
3696	+ msgstr ""
3697	+
3698	+ #: wpsc-admin/display-update.page.php:79
3699	msgid ""
3700	"Your WP e-Commerce database needs to be updated for WP e-Commerce 3.8. To "
3701	"perform this update, press the button below. It is highly recommended that "
3702	"you back up your database before performing this update."
3703	msgstr ""
3704
3705	+ #: wpsc-admin/display-update.page.php:82
3706	msgid ""
3707	"Note: If the server times out or runs out of memory, just reload this page, "
3708	"the server will pick up where it left off."

3761	"longer use."
3762	msgstr ""
3763
3764	+ #: wpsc-admin/display-upgrades.page.php:88
3765	+ msgid "Name:"
3766	+ msgstr ""
3767	+
3768	#: wpsc-admin/display-upgrades.page.php:92
3769	+ msgid "API Key:"
3770	msgstr ""
3771
3772	#: wpsc-admin/display-upgrades.page.php:97

3777	msgid "Your API key has been Reset"
3778	msgstr ""
3779
3780	+ #: wpsc-admin/admin-form-functions.php:64
3781	+ msgid "Conditions"
3782	+ msgstr ""
3783	+
3784	+ #: wpsc-admin/admin-form-functions.php:71
3785	+ msgid "Property"
3786	+ msgstr ""
3787	+
3788	+ #: wpsc-admin/admin-form-functions.php:74
3789	+ msgid "Logic"
3790	+ msgstr ""
3791	+
3792	+ #: wpsc-admin/admin-form-functions.php:117
3793	+ msgid "Add Conditions"
3794	+ msgstr ""
3795	+
3796	#: wpsc-admin/admin-form-functions.php:149
3797	msgid "Update Coupon"
3798	msgstr ""

3802	msgstr ""
3803
3804	#: wpsc-admin/admin-form-functions.php:170

3805	msgid "Shop Settings"
3806	msgstr ""
3807

3813	msgid "Checkout Page Settings"
3814	msgstr ""
3815
3816	+ #: wpsc-admin/admin-form-functions.php:215
3817	+ msgctxt "dashboard widget"
3818	+ msgid "Product"
3819	+ msgid_plural "Products"
3820	+ msgstr[0] ""
3821	+ msgstr[1] ""
3822
3823	+ #: wpsc-admin/admin-form-functions.php:235
3824	+ msgid "Pending sale"
3825	+ msgid_plural "Pending sales"
3826	+ msgstr[0] ""
3827	+ msgstr[1] ""
3828
3829	+ #: wpsc-admin/admin-form-functions.php:243
3830	+ msgid "Variation"
3831	+ msgid_plural "Variations"
3832	+ msgstr[0] ""
3833	+ msgstr[1] ""
3834
3835	+ #: wpsc-admin/admin-form-functions.php:249
3836	+ msgid "Closed sale"
3837	+ msgid_plural "Closed sales"
3838	+ msgstr[0] ""
3839	+ msgstr[1] ""
3840
3841	+ #: wpsc-admin/admin-form-functions.php:263
3842	+ msgid "Right Now"

3843	msgstr ""
3844
3845	+ #: wpsc-admin/admin-form-functions.php:266
3846	+ msgid "You have %s product,"
3847	+ msgid_plural "You have %s products,"
3848	+ msgstr[0] ""
3849	+ msgstr[1] ""
3850
3851	+ #: wpsc-admin/admin-form-functions.php:267
3852	+ msgid " contained within %s category."
3853	+ msgid_plural " contained within %s categories."
3854	+ msgstr[0] ""
3855	+ msgstr[1] ""
3856
3857	+ #: wpsc-admin/admin-form-functions.php:268
3858	+ msgid ""
3859	+ "This month you made %1$s sale and generated a total of %2$s and your total "
3860	+ "sales ever is %3$s."
3861	+ msgid_plural ""
3862	+ "This month you made %1$s sales and generated a total of %2$s and your total "
3863	+ "sales ever is %3$s."
3864	+ msgstr[0] ""
3865	+ msgstr[1] ""
3866
3867	+ #: wpsc-admin/admin-form-functions.php:269
3868	+ msgid "You have %s sale awaiting approval."
3869	+ msgid_plural "You have %s sales awaiting approval."
3870	+ msgstr[0] ""
3871	+ msgstr[1] ""
3872
3873	+ #: wpsc-admin/admin-form-functions.php:272
3874	+ msgid "You are using the %1$s style. This is WP e-Commerce %2$s."


3875	msgstr ""
3876
3877	+ #: wpsc-admin/admin-form-functions.php:296
3878	+ msgid "Packing Slip"
3879	msgstr ""
3880
3881	+ #: wpsc-admin/admin-form-functions.php:386
3882	+ msgid "Manual Payment"
3883	msgstr ""
3884
3885	+ #: wpsc-admin/admin-form-functions.php:407
3886	+ #: wpsc-includes/checkout.class.php:145
3887	+ msgid "Tax"
3888	msgstr ""
3889
3890	+ #: wpsc-admin/admin-form-functions.php:486
3891	+ msgid "This users cart was empty"
3892	msgstr ""
3893
3894	+ #: wpsc-admin/display-sales-logs.php:37
3895	+ msgid "Sales"





3896	msgstr ""
3897
3898	+ #: wpsc-admin/display-sales-logs.php:49
3899	+ msgid "Order ID"
3900	msgstr ""
3901
3902	+ #: wpsc-admin/display-sales-logs.php:50
3903	+ msgid "Date / Time"
3904	msgstr ""
3905
3906	+ #: wpsc-admin/display-sales-logs.php:52
3907	+ msgid "Amount"
3908	msgstr ""
3909
3910	+ #: wpsc-admin/display-sales-logs.php:56 wpsc-admin/display-sales-logs.php:436
3911	+ msgid "Tracking ID"
3912	msgstr ""
3913
3914	#: wpsc-admin/display-sales-logs.php:65

3933	msgid ""
3934	"When upgrading the WP e-Commerce Plugin from 3.6.* to 3.7 it is required "
3935	"that you associate your checkout form fields with the new Purchase Logs "
3936	+ "system. To do so please <a href=\"%s\">Click Here</a>"




3937	msgstr ""
3938
3939	#: wpsc-admin/display-sales-logs.php:117
3940	msgid "Downloads for this log have been released."
3941	+ msgstr ""


3942
3943	#: wpsc-admin/display-sales-logs.php:121
3944	msgid "Receipt has been resent "
3945	+ msgstr ""


3946
3947	#: wpsc-admin/display-sales-logs.php:161
3948	msgid "Shipping Options"

4008	msgid "Items Ordered"
4009	msgstr ""
4010





4011	#: wpsc-admin/display-sales-logs.php:240
4012	msgid "Order Status:"
4013	msgstr ""

4024	msgid "Resend Receipt to Buyer"
4025	msgstr ""
4026
4027	+ #: wpsc-admin/display-sales-logs.php:269 wpsc-admin/display-sales-logs.php:428
4028	msgid "Delete this log"
4029	msgstr ""
4030
4031	+ #: wpsc-admin/display-sales-logs.php:269 wpsc-admin/display-sales-logs.php:428
4032	msgid ""
4033	"You are about to delete this log '%s'\n"
4034	" 'Cancel' to stop, 'OK' to delete."

4042	msgid "Go Back"
4043	msgstr ""
4044
4045	+ #: wpsc-admin/display-sales-logs.php:288
4046	+ msgid "Bulk Actions"








4047	msgstr ""
4048
4049	+ #: wpsc-admin/display-sales-logs.php:299
4050	+ msgid "View:"
4051	msgstr ""
4052
4053	+ #: wpsc-admin/display-sales-logs.php:320
4054	+ msgctxt "all sales"
4055	+ msgid "All"
4056	msgstr ""
4057
4058	+ #: wpsc-admin/display-sales-logs.php:321
4059	+ msgid "Three Months"
4060	msgstr ""
4061
4062	+ #: wpsc-admin/display-sales-logs.php:345
4063	+ msgid "Status: All"
4064	msgstr ""
4065
4066	+ #: wpsc-admin/display-sales-logs.php:348
4067	+ msgid "Filter"
4068	msgstr ""
4069
4070	+ #: wpsc-admin/display-sales-logs.php:351
4071	+ msgid "There are no purchase logs for your selection, please try again."











4072	msgstr ""
4073
4074	+ #: wpsc-admin/display-sales-logs.php:368
4075	+ msgid "Total:"
4076	msgstr ""
4077
4078	+ #: wpsc-admin/display-sales-logs.php:380
4079	+ msgid "Download CSV"
4080	msgstr ""
4081
4082	+ #: wpsc-admin/display-sales-logs.php:389
4083	+ msgid ""
4084	+ "You are about to delete the selected purchase logs.\n"
4085	+ " 'Cancel' to stop, 'OK' to delete."
4086	msgstr ""
4087
4088	+ #: wpsc-admin/display-sales-logs.php:415
4089	+ msgid "%s Item"
4090	+ msgid_plural "%s Items"
4091	+ msgstr[0] ""
4092	+ msgstr[1] ""
4093
4094	+ #: wpsc-admin/display-sales-logs.php:443
4095	+ msgid "Send Custom Message"
4096	msgstr ""
4097
4098	+ #: wpsc-admin/display-sales-logs.php:455
4099	+ msgid "Search Logs"
4100	msgstr ""
4101
4102	+ #: wpsc-admin/display-sales-logs.php:480
4103	+ msgid "Users Custom Fields"
4104	msgstr ""
4105
4106	+ #: wpsc-admin/display-sales-logs.php:485
4107	+ msgid "Cart Items with Custom Files"
4108	msgstr ""
4109
4110	+ #: wpsc-admin/display-sales-logs.php:492
4111	+ msgid "Cart Items with Custom Messages"
4112	msgstr ""
4113
4114	+ #: wpsc-admin/display-sales-logs.php:512
4115	+ msgid "Order Notes"


4116	msgstr ""
4117
4118	+ #: wpsc-admin/display-sales-logs.php:519
4119	+ msgid "Update Notes"
4120	msgstr ""
4121
4122	+ #: wpsc-admin/display-sales-logs.php:534
4123	+ msgid "Additional Checkout Fields"
4124	msgstr ""
4125
4126	#: wpsc-admin/display-options-settings.page.php:109
4127	+ msgctxt "General settings tab in Settings->Store page"
4128	msgid "General"
4129	msgstr ""
4130
4131	#: wpsc-admin/display-options-settings.page.php:110
4132	+ msgctxt "Presentation settings tab in Settings->Store page"
4133	msgid "Presentation"
4134	msgstr ""
4135
4136	#: wpsc-admin/display-options-settings.page.php:111
4137	+ msgctxt "Admin settings tab in Settings->Store page"
4138	msgid "Admin"
4139	msgstr ""
4140
4141	+ #: wpsc-admin/display-options-settings.page.php:112
4142	+ msgctxt "Taxes settings tab in Settings->Store page"
4143	+ msgid "Taxes"
4144	+ msgstr ""
4145	+
4146	+ #: wpsc-admin/display-options-settings.page.php:113
4147	+ msgctxt "Shipping settings tab in Settings->Store page"
4148	+ msgid "Shipping"
4149	+ msgstr ""
4150	+
4151	#: wpsc-admin/display-options-settings.page.php:114
4152	+ msgctxt "Payments settings tab in Settings->Store page"
4153	msgid "Payments"
4154	msgstr ""
4155
4156	+ #: wpsc-admin/display-options-settings.page.php:115
4157	+ msgctxt "Checkout settings tab in Settings->Store page"
4158	+ msgid "Checkout"
4159	+ msgstr ""
4160	+
4161	#: wpsc-admin/display-options-settings.page.php:116
4162	+ msgctxt "Marketing settings tab in Settings->Store page"
4163	msgid "Marketing"
4164	msgstr ""
4165
4166	#: wpsc-admin/display-options-settings.page.php:117
4167	+ msgctxt "Import settings tab in Settings->Store page"
4168	msgid "Import"
4169	msgstr ""
4170

4186	msgstr ""
4187
4188	#: wpsc-admin/display-options-settings.page.php:276
4189	+ msgid "%s Setting options updated."
4190	msgid_plural " %s Settings options updated."
4191	msgstr[0] ""
4192	msgstr[1] ""

4198	msgstr[1] ""
4199
4200	#: wpsc-admin/display-options-settings.page.php:286
4201	+ msgid "%s Shipping option updated."
4202	+ msgid_plural "%s Shipping option updated."
4203	msgstr[0] ""
4204	msgstr[1] ""
4205

4217	msgid "Settings successfully updated."
4218	msgstr ""
4219
4220	+ #: wpsc-admin/ajax-and-init.php:174































4221	msgid ""
4222	"Sorry, for some reason, we couldn't duplicate this product because it could "
4223	"not be found in the database, check there for this ID: "
4224	msgstr ""
4225
4226	+ #: wpsc-admin/ajax-and-init.php:624




4227	msgid "The administrator has unlocked your file"
4228	msgstr ""
4229
4230	+ #: wpsc-admin/ajax-and-init.php:624
4231	msgid ""
4232	"Dear CustomerWe are pleased to advise you that your order has been updated "
4233	"and your downloads are now active.Please download your purchase using the "
4234	"links provided below.[download_links]Thank you for your custom."
4235	msgstr ""
4236
4237	+ #: wpsc-admin/ajax-and-init.php:1175
4238	msgid "Choose a downloadable file for this product:"
4239	msgstr ""
4240
4241	+ #: wpsc-admin/ajax-and-init.php:1719 wpsc-admin/ajax-and-init.php:1734
4242	msgid "Variation Price"
4243	msgstr ""
4244
4245	+ #: wpsc-admin/ajax-and-init.php:1721 wpsc-admin/ajax-and-init.php:1738
4246	msgid ""
4247	"You can list a default price here for this variation. You can list a "
4248	"regular price (18.99), differential price (+1.99 / -2) or even a percentage-"
4249	"based price (+50% / -25%)."
4250	msgstr ""
4251
4252	+ #: wpsc-admin/ajax-and-init.php:1758
4253	msgid "Apply to current variations?"
4254	msgstr ""
4255
4256	+ #: wpsc-admin/ajax-and-init.php:1760
4257	msgid ""
4258	"By checking this box, the price rule you implement above will be applied to "
4259	"all variations that currently exist. If you leave it unchecked, it will "

4271	msgid "Sorry, but you cannot add zero items to your cart"
4272	msgstr ""
4273
4274	+ #: wpsc-includes/ajax.functions.php:85
4275	+ msgid "Sorry, but there is only %s of this item in stock."
4276	+ msgid_plural "Sorry, but there are only %s of this item in stock."
4277	+ msgstr[0] ""
4278	+ msgstr[1] ""
4279
4280	+ #: wpsc-includes/ajax.functions.php:87
4281	+ msgid "Sorry, but the item \"%s\" is out of stock."
4282	msgstr ""
4283
4284	+ #: wpsc-includes/ajax.functions.php:407
4285	msgid "Sorry, but this variation is out of stock."
4286	msgstr ""
4287
4288	+ #: wpsc-includes/ajax.functions.php:408
4289	msgid "Variation not in stock"
4290	msgstr ""
4291
4292	+ #: wpsc-includes/ajax.functions.php:515
4293	msgid ""
4294	"You must select a shipping method, otherwise we cannot process your order."
4295	msgstr ""
4296
4297	+ #: wpsc-includes/ajax.functions.php:519
4298	msgid ""
4299	"Please agree to the terms and conditions, otherwise we cannot process your "
4300	"order."
4301	msgstr ""
4302
4303	+ #: wpsc-includes/ajax.functions.php:533
4304	msgid ""
4305	"%s cannot be shipped to %s. To continue with your transaction please remove "
4306	"this product from the list below."
4307	msgstr ""
4308
4309	+ #: wpsc-includes/ajax.functions.php:553
4310	msgid "Please enter a Zipcode and click calculate to proceed"
4311	msgstr ""
4312
4313	+ #: wpsc-includes/ajax.functions.php:945
4314	msgid "Invalid Image parameters"
4315	msgstr ""
4316
4317	+ #: wpsc-includes/ajax.functions.php:974 wpsc-includes/ajax.functions.php:991
4318	+ #: wpsc-includes/ajax.functions.php:1064
4319	msgid ""
4320	"This download is no longer valid, Please contact the site administrator for "
4321	"more information."
4322	msgstr ""
4323
4324	+ #: wpsc-includes/theme.functions.php:176
4325	msgid ""
4326	"<strong>WP e-Commerce is ready</strong>. If you plan on editing the look of "
4327	"your site, you should <a href=\"%1s\">update your active theme</a> to "

4329	"to ignore and remove this box."
4330	msgstr ""
4331
4332	+ #: wpsc-includes/theme.functions.php:194
4333	msgid ""
4334	"<strong>Your WP e-Commerce data needs to be updated</strong>. You've "
4335	"upgraded from a previous version of the WP e-Commerce plugin, and your store "

4337	"your store to continue working."
4338	msgstr ""
4339
4340	+ #: wpsc-includes/theme.functions.php:231
4341	msgid ""
4342	"<strong>Store Settings</strong>: You have set 'users must register before "
4343	"checkout', for this to work you need to check 'Anyone can register' in your "

4489	msgid "Choose a downloadable file for this variation"
4490	msgstr ""
4491
4492	+ #: wpsc-includes/processing.functions.php:123
4493	+ msgid "%s is out of stock"
4494	msgstr ""
4495
4496	+ #: wpsc-includes/processing.functions.php:123
4497	+ msgid "Remaining stock of %s is 0. Product was unpublished."
4498	msgstr ""
4499
4500	+ #: wpsc-includes/processing.functions.php:289




4501	msgid "This product has no available stock"
4502	msgstr ""
4503
4504	+ #: wpsc-includes/processing.functions.php:312
4505	msgid "One or more of this products variations are out of stock."
4506	msgstr ""
4507
4508	+ #: wpsc-includes/processing.functions.php:346
4509	msgid ""
4510	" does not support products without a weight set. Please either disable "
4511	"shipping for this product or give it a weight"

4515	msgid "Pages: "
4516	msgstr ""
4517
4518	+ #: wpsc-includes/product-template.php:134
4519	+ msgid "First Page"
4520	+ msgstr ""
4521	+
4522	+ #: wpsc-includes/product-template.php:134
4523	+ msgid "« First"
4524	+ msgstr ""
4525	+
4526	+ #: wpsc-includes/product-template.php:139
4527	+ msgid "Previous Page"
4528	+ msgstr ""
4529	+
4530	+ #: wpsc-includes/product-template.php:139
4531	+ msgid "< Previous"
4532	+ msgstr ""
4533	+
4534	+ #: wpsc-includes/product-template.php:147
4535	+ #: wpsc-includes/product-template.php:149
4536	+ #: wpsc-includes/product-template.php:166
4537	+ msgid "Page %s"
4538	+ msgstr ""
4539	+
4540	+ #: wpsc-includes/product-template.php:177
4541	+ msgid "Next Page"
4542	+ msgstr ""
4543	+
4544	+ #: wpsc-includes/product-template.php:177
4545	+ msgid "Next >"
4546	+ msgstr ""
4547	+
4548	+ #: wpsc-includes/product-template.php:181
4549	+ msgid "Last Page"
4550	+ msgstr ""
4551	+
4552	+ #: wpsc-includes/product-template.php:181
4553	+ msgid "Last »"
4554	+ msgstr ""
4555	+
4556	+ #: wpsc-includes/product-template.php:346
4557	msgid " from %s"
4558	msgstr ""
4559
4560	+ #: wpsc-includes/product-template.php:635
4561	+ msgid "Read the rest of this entry »"
4562	+ msgstr ""
4563	+
4564	+ #: wpsc-includes/product-template.php:1415
4565	msgid "Avg. Customer Rating"
4566	msgstr ""
4567
4568	+ #: wpsc-includes/product-template.php:1421
4569	msgid "Your Rating"
4570	msgstr ""
4571
4572	+ #: wpsc-includes/product-template.php:1422
4573	msgid "Saved"
4574	msgstr ""
4575
4576	+ #: wpsc-includes/product-template.php:1477
4577	msgid "Save"
4578	msgstr ""
4579
4580	+ #: wpsc-includes/checkout.class.php:762
4581	+ msgid "Please enter a valid card number."
4582	+ msgstr ""
4583	+
4584	+ #: wpsc-includes/checkout.class.php:772
4585	+ msgid "Please enter a valid expiry date."
4586	+ msgstr ""
4587	+
4588	+ #: wpsc-includes/checkout.class.php:780 wpsc-includes/checkout.class.php:790
4589	+ msgid "Please enter a valid CVV."
4590	+ msgstr ""
4591	+
4592	+ #: wpsc-includes/checkout.class.php:856
4593	+ msgid "Please enter a valid %s."
4594	msgstr ""
4595
4596	#: wpsc-includes/purchaselogs.class.php:558
4597	msgid "Release downloads locked to this IP address %s"
4598	msgstr ""
4599
4600	+ #: wpsc-includes/purchaselogs.class.php:753
4601	msgid "Thanks, the purchase log record has been deleted"
4602	msgstr ""
4603

4605	msgid "WP e-Commerce"
4606	msgstr ""
4607
4608	+ #: wpsc-includes/display.functions.php:83
4609	msgid "People who bought this item also bought"
4610	msgstr ""
4611
4612	+ #: wpsc-includes/display.functions.php:135
4613	msgid "Updating"
4614	msgstr ""
4615
4616	+ #: wpsc-includes/display.functions.php:155
4617	msgid "Go to Checkout"
4618	msgstr ""
4619
4620	+ #: wpsc-includes/display.functions.php:156
4621	msgid "Continue Shopping"
4622	msgstr ""
4623
4624	+ #: wpsc-includes/display.functions.php:194
4625	msgid ""
4626	"You are using the example product group as your default group and it has no "
4627	"products in it, you should set the default group to something else, you can "
4628	"do so from your Shop Settings page."
4629	msgstr ""
4630
4631	+ #: wpsc-includes/display.functions.php:196
4632	msgid ""
4633	"This group is set as your default product group, you should either add some "
4634	"items to it or switch your default product group to one that does contain "

4642	msgid "Invalid Taxonomy"
4643	msgstr ""
4644
4645	+ #: wpsc-taxes/controllers/taxes_controller.class.php:302
4646	+ #: wpsc-taxes/controllers/taxes_controller.class.php:313
4647	msgid "Disabled"
4648	msgstr ""
4649
4650	+ #: wpsc-taxes/controllers/taxes_controller.class.php:318
4651	msgid ""
4652	"No Tax Bands Setup. Set Tax Bands up in <a href=\"options-general.php?"
4653	"page=wpsc-settings&tab=taxes\">Settings > Taxes</a>"
4654	msgstr ""
4655
4656	+ #: wpsc-taxes/controllers/taxes_controller.class.php:322






4657	msgid ""
4658	"Taxes are not enabled. See <a href=\"options-general.php?page=wpsc-"
4659	"settings&tab=taxes\">Settings > Taxes</a>"
4660	msgstr ""
4661
4662	+ #: wpsc-taxes/controllers/taxes_controller.class.php:534
4663	msgid "Apply to Shipping"
4664	msgstr ""
4665
4666	+ #: wpsc-taxes/controllers/taxes_controller.class.php:593
4667	+ msgid "All Markets"
4668	+ msgstr ""
4669	+
4670	#: wpsc-shipping/australiapost.php:47
4671	msgid "Australia Post"
4672	msgstr ""

4691	msgid "Express Post International"
4692	msgstr ""
4693
4694	+ #: wpsc-shipping/australiapost.php:95
4695	msgid ""
4696	"This shipping module only works if the base country in settings, region is "
4697	"set to Australia."
4698	msgstr ""
4699
4700	+ #: wpsc-shipping/australiapost.php:100
4701	msgid ""
4702	"You must set your base postcode above before this shipping module will work."
4703	msgstr ""
4704
4705	+ #: wpsc-shipping/australiapost.php:103
4706	msgid ""
4707	"Select the Australia Post services that you want to offer during checkout:"
4708	msgstr ""
4709
4710	+ #: wpsc-shipping/australiapost.php:111
4711	msgid "Notes:"
4712	msgstr ""
4713
4714	+ #: wpsc-shipping/australiapost.php:112
4715	msgid ""
4716	"1. The actual services quoted to the customer during checkout will depend on "
4717	"the destination country. Not all methods are available to all destinations."
4718	msgstr ""
4719
4720	+ #: wpsc-shipping/australiapost.php:113
4721	msgid ""
4722	"2. Each product must have a valid weight configured. When editing a product, "
4723	"use the weight field.)."
4724	msgstr ""
4725
4726	+ #: wpsc-shipping/australiapost.php:114
4727	msgid ""
4728	"3. To ensure accurate quotes, each product must valid dimensions configured. "
4729	"When editing a product, use the height, width and length fields."
4730	msgstr ""
4731
4732	+ #: wpsc-shipping/australiapost.php:115
4733	msgid ""
4734	"4. The combined dimensions are estimated by calculating the volume of each "
4735	"item, and then calculating the cubed root of the overall order volume which "
4736	"becomes width, length and height."
4737	msgstr ""
4738
4739	+ #: wpsc-shipping/australiapost.php:116
4740	msgid ""
4741	+ "5. If no product dimensions are defined, then default package dimensions of "
4742	"100mm x 100mm x 100mm will be used."
4743	msgstr ""
4744
4745	+ #: wpsc-shipping/australiapost.php:362
4746	msgid "%1$s (estimated delivery time: %2$d business day)"
4747	msgid_plural "%1$s (estimated delivery time: %2$d business days)"
4748	msgstr[0] ""
4749	msgstr[1] ""
4750
4751	+ #: wpsc-shipping/ups_20.php:103




















4752	msgid "UPS Letter"
4753	msgstr ""
4754
4755	+ #: wpsc-shipping/ups_20.php:104
4756	msgid "Your Packaging"
4757	msgstr ""
4758
4759	+ #: wpsc-shipping/ups_20.php:105
4760	msgid "UPS Tube"
4761	msgstr ""
4762
4763	+ #: wpsc-shipping/ups_20.php:106
4764	msgid "UPS Pak"
4765	msgstr ""
4766
4767	+ #: wpsc-shipping/ups_20.php:107
4768	msgid "UPS Express Box"
4769	msgstr ""
4770
4771	+ #: wpsc-shipping/ups_20.php:108
4772	msgid "UPS Express Box - Small"
4773	msgstr ""
4774
4775	+ #: wpsc-shipping/ups_20.php:109
4776	msgid "UPS Express Box - Medium"
4777	msgstr ""
4778
4779	+ #: wpsc-shipping/ups_20.php:110
4780	msgid "UPS Express Box - Large"
4781	msgstr ""
4782
4783	+ #: wpsc-shipping/ups_20.php:113
4784	msgid "Destination Type"
4785	msgstr ""
4786
4787	+ #: wpsc-shipping/ups_20.php:124
4788	msgid "Residential Address"
4789	msgstr ""
4790
4791	+ #: wpsc-shipping/ups_20.php:125
4792	msgid "Commercial Address"
4793	msgstr ""
4794
4795	+ #: wpsc-shipping/ups_20.php:131
4796	msgid "Dropoff Type"
4797	msgstr ""
4798
4799	+ #: wpsc-shipping/ups_20.php:165
4800	msgid "Customer Type"
4801	msgstr ""
4802
4803	+ #: wpsc-shipping/ups_20.php:187
4804	msgid "Packaging"
4805	msgstr ""
4806
4807	+ #: wpsc-shipping/ups_20.php:207
4808	msgid "Use Testing Environment"
4809	msgstr ""
4810
4811	+ #: wpsc-shipping/ups_20.php:220
4812	msgid "Show UPS negotiated rates"
4813	msgstr ""
4814
4815	+ #: wpsc-shipping/ups_20.php:232
4816	+ msgid "Insure shipment against cart total"
4817	+ msgstr ""
4818	+
4819	+ #: wpsc-shipping/ups_20.php:244
4820	+ msgid "Singular Shipping"
4821	+ msgstr ""
4822	+
4823	+ #: wpsc-shipping/ups_20.php:247
4824	+ msgid ""
4825	+ "Rate each quantity of items in a cart as its own package using dimensions on "
4826	+ "product"
4827	+ msgstr ""
4828	+
4829	+ #: wpsc-shipping/ups_20.php:254
4830	msgid "UPS Preferred Services"
4831	msgstr ""
4832
4833	+ #: wpsc-shipping/ups_20.php:275
4834	msgid "All services used if no services selected"
4835	msgstr ""
4836
4837	+ #: wpsc-shipping/ups_20.php:279
4838	msgid "UPS Account #"
4839	msgstr ""
4840
4841	+ #: wpsc-shipping/ups_20.php:285
4842	msgid "UPS Username"
4843	msgstr ""
4844
4845	+ #: wpsc-shipping/ups_20.php:291
4846	msgid "UPS Password"
4847	msgstr ""
4848
4849	+ #: wpsc-shipping/ups_20.php:297
4850	msgid "UPS XML API Key"
4851	msgstr ""
4852
4853	+ #: wpsc-shipping/ups_20.php:301
4854	msgid "Don't have an API login/ID ?"
4855	msgstr ""
4856
4857	+ #: wpsc-shipping/ups_20.php:302 wpsc-shipping/usps_20.php:198
4858	+ msgid "Click Here"
4859	+ msgstr ""
4860	+
4861	+ #: wpsc-shipping/ups_20.php:304
4862	msgid ""
4863	"* For Negotiated rates, you must enter a UPS account number and select "
4864	"\"Show UPS negotiated rates\" "
4865	msgstr ""
4866
4867	+ #: wpsc-shipping/usps_20.php:190
4868	+ msgid "USPS ID"
4869	+ msgstr ""
4870	+
4871	+ #: wpsc-shipping/usps_20.php:196
4872	+ msgid "Don't have a USPS API account ? "
4873	+ msgstr ""
4874	+
4875	+ #: wpsc-shipping/usps_20.php:203
4876	+ msgid "Use Test Server:"
4877	+ msgstr ""
4878	+
4879	+ #: wpsc-shipping/usps_20.php:213
4880	+ msgid "Advanced Rates:"
4881	+ msgstr ""
4882	+
4883	+ #: wpsc-shipping/usps_20.php:220
4884	+ msgid ""
4885	+ "This setting will provide rates based on the dimensions from eacy item in "
4886	+ "your cart"
4887	+ msgstr ""
4888	+
4889	+ #: wpsc-shipping/usps_20.php:224
4890	+ msgid "Select Services"
4891	+ msgstr ""
4892	+
4893	+ #: wpsc-shipping/usps_20.php:244
4894	+ msgid "Online rates the following services only, when available"
4895	+ msgstr ""
4896	+
4897	+ #: wpsc-shipping/usps_20.php:256
4898	+ msgid "International Package Type"
4899	+ msgstr ""
4900	+
4901	+ #: wpsc-shipping/usps_20.php:279
4902	+ msgid "First Class Mail Type"
4903	+ msgstr ""
4904	+
4905	+ #: wpsc-shipping/usps_20.php:302
4906	+ msgid "Only used for First Class service rates if selected"
4907	+ msgstr ""
4908	+
4909	#: wpsc-shipping/tablerate.php:50 wpsc-shipping/weightrate.php:49
4910	msgid "Shipping Price"
4911	msgstr ""
4912
4913	+ #: wpsc-shipping/tablerate.php:72
4914	+ msgid "Add Layer"
4915	+ msgstr ""
4916	+
4917	#: wpsc-shipping/weightrate.php:49
4918	msgid ""
4919	"Total weight <br />(<abbr alt=\"You must enter the weight here in pounds, "
4920	"regardless of what you used on your products\" title=\"You must enter the "
4921	"weight here in pounds, regardless of what you used on your products\">in "
4922	+ "pounds</abbr>)"
4923	msgstr ""
4924
4925	#: wpsc-shipping/flatrate.php:50

4936	msgid "Mauritanian Ouguiya"
4937	msgstr ""
4938
4939	+ #: wpsc-updates/currency_list.php:2
4940	+ msgid "MRO"
4941	+ msgstr ""
4942	+
4943	#: wpsc-updates/currency_list.php:3
4944	msgid "Martinique (French)"
4945	msgstr ""

4958	msgid "Euro"
4959	msgstr ""
4960
4961	+ #: wpsc-updates/currency_list.php:3 wpsc-updates/currency_list.php:13
4962	+ #: wpsc-updates/currency_list.php:34 wpsc-updates/currency_list.php:37
4963	+ #: wpsc-updates/currency_list.php:55 wpsc-updates/currency_list.php:57
4964	+ #: wpsc-updates/currency_list.php:60 wpsc-updates/currency_list.php:64
4965	+ #: wpsc-updates/currency_list.php:65 wpsc-updates/currency_list.php:66
4966	+ #: wpsc-updates/currency_list.php:117 wpsc-updates/currency_list.php:124
4967	+ #: wpsc-updates/currency_list.php:132 wpsc-updates/currency_list.php:141
4968	+ #: wpsc-updates/currency_list.php:145 wpsc-updates/currency_list.php:154
4969	+ #: wpsc-updates/currency_list.php:176 wpsc-updates/currency_list.php:179
4970	+ #: wpsc-updates/currency_list.php:186 wpsc-updates/currency_list.php:196
4971	+ #: wpsc-updates/currency_list.php:202 wpsc-updates/currency_list.php:232
4972	+ msgid "€"
4973	+ msgstr ""
4974	+
4975	+ #: wpsc-updates/currency_list.php:3 wpsc-updates/currency_list.php:13
4976	+ #: wpsc-updates/currency_list.php:34 wpsc-updates/currency_list.php:37
4977	+ #: wpsc-updates/currency_list.php:55 wpsc-updates/currency_list.php:57
4978	+ #: wpsc-updates/currency_list.php:60 wpsc-updates/currency_list.php:64
4979	+ #: wpsc-updates/currency_list.php:65 wpsc-updates/currency_list.php:66
4980	+ #: wpsc-updates/currency_list.php:117 wpsc-updates/currency_list.php:124
4981	+ #: wpsc-updates/currency_list.php:132 wpsc-updates/currency_list.php:141
4982	+ #: wpsc-updates/currency_list.php:145 wpsc-updates/currency_list.php:154
4983	+ #: wpsc-updates/currency_list.php:176 wpsc-updates/currency_list.php:179
4984	+ #: wpsc-updates/currency_list.php:186 wpsc-updates/currency_list.php:196
4985	+ #: wpsc-updates/currency_list.php:202 wpsc-updates/currency_list.php:232
4986	+ msgid "€"
4987	+ msgstr ""
4988	+
4989	+ #: wpsc-updates/currency_list.php:3 wpsc-updates/currency_list.php:13
4990	+ #: wpsc-updates/currency_list.php:34 wpsc-updates/currency_list.php:37
4991	+ #: wpsc-updates/currency_list.php:55 wpsc-updates/currency_list.php:57
4992	+ #: wpsc-updates/currency_list.php:60 wpsc-updates/currency_list.php:64
4993	+ #: wpsc-updates/currency_list.php:65 wpsc-updates/currency_list.php:66
4994	+ #: wpsc-updates/currency_list.php:117 wpsc-updates/currency_list.php:124
4995	+ #: wpsc-updates/currency_list.php:132 wpsc-updates/currency_list.php:141
4996	+ #: wpsc-updates/currency_list.php:145 wpsc-updates/currency_list.php:154
4997	+ #: wpsc-updates/currency_list.php:176 wpsc-updates/currency_list.php:179
4998	+ #: wpsc-updates/currency_list.php:186 wpsc-updates/currency_list.php:196
4999	+ #: wpsc-updates/currency_list.php:202 wpsc-updates/currency_list.php:232
5000	+ msgid "EUR"
5001	+ msgstr ""
5002	+
5003	#: wpsc-updates/currency_list.php:4
5004	msgid "Malta"
5005	msgstr ""

5008	msgid "Maltese Lira"
5009	msgstr ""
5010
5011	+ #: wpsc-updates/currency_list.php:4
5012	+ msgid "MTL"
5013	+ msgstr ""
5014	+
5015	#: wpsc-updates/currency_list.php:5
5016	msgid "Marshall Islands"
5017	msgstr ""

5026	msgid "US Dollar"
5027	msgstr ""
5028
5029	+ #: wpsc-updates/currency_list.php:5 wpsc-updates/currency_list.php:17
5030	+ #: wpsc-updates/currency_list.php:26 wpsc-updates/currency_list.php:32
5031	+ #: wpsc-updates/currency_list.php:44 wpsc-updates/currency_list.php:46
5032	+ #: wpsc-updates/currency_list.php:48 wpsc-updates/currency_list.php:53
5033	+ #: wpsc-updates/currency_list.php:54 wpsc-updates/currency_list.php:67
5034	+ #: wpsc-updates/currency_list.php:79 wpsc-updates/currency_list.php:88
5035	+ #: wpsc-updates/currency_list.php:92 wpsc-updates/currency_list.php:93
5036	+ #: wpsc-updates/currency_list.php:98 wpsc-updates/currency_list.php:101
5037	+ #: wpsc-updates/currency_list.php:106 wpsc-updates/currency_list.php:114
5038	+ #: wpsc-updates/currency_list.php:116 wpsc-updates/currency_list.php:119
5039	+ #: wpsc-updates/currency_list.php:122 wpsc-updates/currency_list.php:128
5040	+ #: wpsc-updates/currency_list.php:129 wpsc-updates/currency_list.php:130
5041	+ #: wpsc-updates/currency_list.php:133 wpsc-updates/currency_list.php:137
5042	+ #: wpsc-updates/currency_list.php:138 wpsc-updates/currency_list.php:143
5043	+ #: wpsc-updates/currency_list.php:147 wpsc-updates/currency_list.php:151
5044	+ #: wpsc-updates/currency_list.php:152 wpsc-updates/currency_list.php:157
5045	+ #: wpsc-updates/currency_list.php:161 wpsc-updates/currency_list.php:162
5046	+ #: wpsc-updates/currency_list.php:163 wpsc-updates/currency_list.php:167
5047	+ #: wpsc-updates/currency_list.php:173 wpsc-updates/currency_list.php:177
5048	+ #: wpsc-updates/currency_list.php:184 wpsc-updates/currency_list.php:185
5049	+ #: wpsc-updates/currency_list.php:187 wpsc-updates/currency_list.php:195
5050	+ #: wpsc-updates/currency_list.php:198 wpsc-updates/currency_list.php:211
5051	+ #: wpsc-updates/currency_list.php:216 wpsc-updates/currency_list.php:218
5052	+ #: wpsc-updates/currency_list.php:219 wpsc-updates/currency_list.php:222
5053	+ #: wpsc-updates/currency_list.php:223 wpsc-updates/currency_list.php:229
5054	+ #: wpsc-updates/currency_list.php:235 wpsc-updates/currency_list.php:236
5055	+ #: wpsc-updates/currency_list.php:242
5056	+ msgid "$"
5057	+ msgstr ""
5058	+
5059	+ #: wpsc-updates/currency_list.php:5 wpsc-updates/currency_list.php:17
5060	+ #: wpsc-updates/currency_list.php:26 wpsc-updates/currency_list.php:32
5061	+ #: wpsc-updates/currency_list.php:44 wpsc-updates/currency_list.php:46
5062	+ #: wpsc-updates/currency_list.php:48 wpsc-updates/currency_list.php:53
5063	+ #: wpsc-updates/currency_list.php:54 wpsc-updates/currency_list.php:67
5064	+ #: wpsc-updates/currency_list.php:79 wpsc-updates/currency_list.php:88
5065	+ #: wpsc-updates/currency_list.php:92 wpsc-updates/currency_list.php:93
5066	+ #: wpsc-updates/currency_list.php:98 wpsc-updates/currency_list.php:101
5067	+ #: wpsc-updates/currency_list.php:106 wpsc-updates/currency_list.php:114
5068	+ #: wpsc-updates/currency_list.php:116 wpsc-updates/currency_list.php:119
5069	+ #: wpsc-updates/currency_list.php:122 wpsc-updates/currency_list.php:128
5070	+ #: wpsc-updates/currency_list.php:129 wpsc-updates/currency_list.php:130
5071	+ #: wpsc-updates/currency_list.php:133 wpsc-updates/currency_list.php:137
5072	+ #: wpsc-updates/currency_list.php:138 wpsc-updates/currency_list.php:143
5073	+ #: wpsc-updates/currency_list.php:147 wpsc-updates/currency_list.php:151
5074	+ #: wpsc-updates/currency_list.php:152 wpsc-updates/currency_list.php:157
5075	+ #: wpsc-updates/currency_list.php:161 wpsc-updates/currency_list.php:162
5076	+ #: wpsc-updates/currency_list.php:163 wpsc-updates/currency_list.php:167
5077	+ #: wpsc-updates/currency_list.php:173 wpsc-updates/currency_list.php:177
5078	+ #: wpsc-updates/currency_list.php:184 wpsc-updates/currency_list.php:185
5079	+ #: wpsc-updates/currency_list.php:187 wpsc-updates/currency_list.php:195
5080	+ #: wpsc-updates/currency_list.php:198 wpsc-updates/currency_list.php:211
5081	+ #: wpsc-updates/currency_list.php:216 wpsc-updates/currency_list.php:218
5082	+ #: wpsc-updates/currency_list.php:219 wpsc-updates/currency_list.php:222
5083	+ #: wpsc-updates/currency_list.php:223 wpsc-updates/currency_list.php:229
5084	+ #: wpsc-updates/currency_list.php:235 wpsc-updates/currency_list.php:236
5085	+ #: wpsc-updates/currency_list.php:242
5086	+ msgid "$"
5087	+ msgstr ""
5088	+
5089	+ #: wpsc-updates/currency_list.php:5 wpsc-updates/currency_list.php:53
5090	+ #: wpsc-updates/currency_list.php:133 wpsc-updates/currency_list.php:137
5091	+ #: wpsc-updates/currency_list.php:143 wpsc-updates/currency_list.php:163
5092	+ #: wpsc-updates/currency_list.php:167 wpsc-updates/currency_list.php:177
5093	+ #: wpsc-updates/currency_list.php:222 wpsc-updates/currency_list.php:229
5094	+ #: wpsc-updates/currency_list.php:235 wpsc-updates/currency_list.php:236
5095	+ msgid "USD"
5096	+ msgstr ""
5097	+
5098	#: wpsc-updates/currency_list.php:6
5099	msgid "Mali"
5100	msgstr ""

5103	#: wpsc-updates/currency_list.php:104 wpsc-updates/currency_list.php:115
5104	#: wpsc-updates/currency_list.php:159 wpsc-updates/currency_list.php:192
5105	#: wpsc-updates/currency_list.php:215
5106	+ msgid "CFA Franc BCEAO"
5107	+ msgstr ""
5108	+
5109	+ #: wpsc-updates/currency_list.php:6 wpsc-updates/currency_list.php:33
5110	+ #: wpsc-updates/currency_list.php:104 wpsc-updates/currency_list.php:115
5111	+ #: wpsc-updates/currency_list.php:159 wpsc-updates/currency_list.php:192
5112	+ #: wpsc-updates/currency_list.php:215
5113	+ msgid "XOF"
5114	msgstr ""
5115
5116	#: wpsc-updates/currency_list.php:7

5121	msgid "Maldive Rufiyaa"
5122	msgstr ""
5123
5124	+ #: wpsc-updates/currency_list.php:7
5125	+ msgid "MVR"
5126	+ msgstr ""
5127	+
5128	#: wpsc-updates/currency_list.php:8
5129	msgid "Malaysia"
5130	msgstr ""

5133	msgid "Malaysian Ringgit"
5134	msgstr ""
5135
5136	+ #: wpsc-updates/currency_list.php:8
5137	+ msgid "MYR"
5138	+ msgstr ""
5139	+
5140	#: wpsc-updates/currency_list.php:9
5141	msgid "Malawi"
5142	msgstr ""

5145	msgid "Malawi Kwacha"
5146	msgstr ""
5147
5148	+ #: wpsc-updates/currency_list.php:9
5149	+ msgid "MWK"
5150	+ msgstr ""
5151	+
5152	#: wpsc-updates/currency_list.php:10
5153	msgid "Madagascar"
5154	msgstr ""

5157	msgid "Malagasy Franc"
5158	msgstr ""
5159
5160	+ #: wpsc-updates/currency_list.php:10
5161	+ msgid "MGF"
5162	+ msgstr ""
5163	+
5164	#: wpsc-updates/currency_list.php:11
5165	msgid "Macau"
5166	msgstr ""

5169	msgid "Macau Pataca"
5170	msgstr ""
5171
5172	+ #: wpsc-updates/currency_list.php:11
5173	+ msgid "MOP"
5174	+ msgstr ""
5175	+
5176	#: wpsc-updates/currency_list.php:12
5177	msgid "Macedonia"
5178	msgstr ""

5181	msgid "Denar"
5182	msgstr ""
5183
5184	+ #: wpsc-updates/currency_list.php:12
5185	+ msgid "MKD"
5186	+ msgstr ""
5187	+
5188	#: wpsc-updates/currency_list.php:13
5189	msgid "Luxembourg"
5190	msgstr ""

5197	msgid "Lithuanian Litas"
5198	msgstr ""
5199
5200	+ #: wpsc-updates/currency_list.php:14
5201	+ msgid "LTL"
5202	+ msgstr ""
5203	+
5204	#: wpsc-updates/currency_list.php:15
5205	msgid "Liechtenstein"
5206	msgstr ""

5209	msgid "Swiss Franc"
5210	msgstr ""
5211
5212	+ #: wpsc-updates/currency_list.php:15 wpsc-updates/currency_list.php:209
5213	+ msgid "CHF"
5214	+ msgstr ""
5215	+
5216	#: wpsc-updates/currency_list.php:16
5217	msgid "Libya"
5218	msgstr ""

5221	msgid "Libyan Dinar"
5222	msgstr ""
5223
5224	+ #: wpsc-updates/currency_list.php:16
5225	+ msgid "LYD"
5226	+ msgstr ""
5227	+
5228	#: wpsc-updates/currency_list.php:17
5229	msgid "Liberia"
5230	msgstr ""

5233	msgid "Liberian Dollar"
5234	msgstr ""
5235
5236	+ #: wpsc-updates/currency_list.php:17
5237	+ msgid "LRD"
5238	+ msgstr ""
5239	+
5240	#: wpsc-updates/currency_list.php:18
5241	msgid "Lesotho"
5242	msgstr ""

5245	msgid "Lesotho Loti"
5246	msgstr ""
5247
5248	+ #: wpsc-updates/currency_list.php:18
5249	+ msgid "LSL"
5250	+ msgstr ""
5251	+
5252	#: wpsc-updates/currency_list.php:19
5253	msgid "Lebanon"
5254	msgstr ""

5257	msgid "Lebanese Pound"
5258	msgstr ""
5259
5260	+ #: wpsc-updates/currency_list.php:19
5261	+ msgid "LBP"
5262	+ msgstr ""
5263	+
5264	#: wpsc-updates/currency_list.php:20
5265	msgid "Latvia"
5266	msgstr ""

5269	msgid "Latvian Lats"
5270	msgstr ""
5271
5272	+ #: wpsc-updates/currency_list.php:20
5273	+ msgid "LVL"
5274	+ msgstr ""
5275	+
5276	#: wpsc-updates/currency_list.php:21
5277	msgid "Laos"
5278	msgstr ""

5281	msgid "Lao Kip"
5282	msgstr ""
5283
5284	+ #: wpsc-updates/currency_list.php:21
5285	+ msgid "LAK"
5286	+ msgstr ""
5287	+
5288	#: wpsc-updates/currency_list.php:22
5289	msgid "Kyrgyzstan"
5290	msgstr ""

5293	msgid "Som"
5294	msgstr ""
5295
5296	+ #: wpsc-updates/currency_list.php:22
5297	+ msgid "KGS"
5298	+ msgstr ""
5299	+
5300	#: wpsc-updates/currency_list.php:23
5301	msgid "Kuwait"
5302	msgstr ""

5305	msgid "Kuwaiti Dinar"
5306	msgstr ""
5307
5308	+ #: wpsc-updates/currency_list.php:23
5309	+ msgid "KWD"
5310	+ msgstr ""
5311	+
5312	#: wpsc-updates/currency_list.php:24
5313	msgid "Korea, South"
5314	msgstr ""

5317	msgid "Korean Won"
5318	msgstr ""
5319
5320	+ #: wpsc-updates/currency_list.php:24
5321	+ msgid "KRW"
5322	+ msgstr ""
5323	+
5324	#: wpsc-updates/currency_list.php:25
5325	msgid "Korea, North"
5326	msgstr ""

5329	msgid "North Korean Won"
5330	msgstr ""
5331
5332	+ #: wpsc-updates/currency_list.php:25
5333	+ msgid "KPW"
5334	+ msgstr ""
5335	+
5336	#: wpsc-updates/currency_list.php:26
5337	msgid "Kiribati"
5338	msgstr ""

5344	msgid "Australian Dollar"
5345	msgstr ""
5346
5347	+ #: wpsc-updates/currency_list.php:26 wpsc-updates/currency_list.php:46
5348	+ #: wpsc-updates/currency_list.php:93 wpsc-updates/currency_list.php:138
5349	+ #: wpsc-updates/currency_list.php:152 wpsc-updates/currency_list.php:162
5350	+ #: wpsc-updates/currency_list.php:223
5351	+ msgid "AUD"
5352	+ msgstr ""
5353	+
5354	#: wpsc-updates/currency_list.php:27
5355	msgid "Kenya"
5356	msgstr ""

5359	msgid "Kenyan Shilling"
5360	msgstr ""
5361
5362	+ #: wpsc-updates/currency_list.php:27
5363	+ msgid "KES"
5364	+ msgstr ""
5365	+
5366	#: wpsc-updates/currency_list.php:28
5367	msgid "Kazakhstan"
5368	msgstr ""

5371	msgid "Kazakhstan Tenge"
5372	msgstr ""
5373
5374	+ #: wpsc-updates/currency_list.php:28
5375	+ msgid "KZT"
5376	+ msgstr ""
5377	+
5378	#: wpsc-updates/currency_list.php:29
5379	msgid "Jordan"
5380	msgstr ""

5383	msgid "Jordanian Dinar"
5384	msgstr ""
5385
5386	+ #: wpsc-updates/currency_list.php:29
5387	+ msgid "JOD"
5388	+ msgstr ""
5389	+
5390	#: wpsc-updates/currency_list.php:30
5391	msgid "Jersey"
5392	msgstr ""

5397	msgid "Pound Sterling"
5398	msgstr ""
5399
5400	+ #: wpsc-updates/currency_list.php:30 wpsc-updates/currency_list.php:35
5401	+ #: wpsc-updates/currency_list.php:51 wpsc-updates/currency_list.php:139
5402	+ #: wpsc-updates/currency_list.php:201 wpsc-updates/currency_list.php:224
5403	+ msgid "£"
5404	+ msgstr ""
5405	+
5406	+ #: wpsc-updates/currency_list.php:30 wpsc-updates/currency_list.php:35
5407	+ #: wpsc-updates/currency_list.php:51 wpsc-updates/currency_list.php:139
5408	+ #: wpsc-updates/currency_list.php:201 wpsc-updates/currency_list.php:224
5409	+ msgid "£"
5410	+ msgstr ""
5411	+
5412	+ #: wpsc-updates/currency_list.php:30 wpsc-updates/currency_list.php:35
5413	+ #: wpsc-updates/currency_list.php:51 wpsc-updates/currency_list.php:139
5414	+ #: wpsc-updates/currency_list.php:201 wpsc-updates/currency_list.php:224
5415	+ msgid "GBP"
5416	+ msgstr ""
5417	+
5418	#: wpsc-updates/currency_list.php:31
5419	msgid "Japan"
5420	msgstr ""

5423	msgid "Japanese Yen"
5424	msgstr ""
5425
5426	+ #: wpsc-updates/currency_list.php:31
5427	+ msgid "¥"
5428	+ msgstr ""
5429	+
5430	+ #: wpsc-updates/currency_list.php:31
5431	+ msgid "¥"
5432	+ msgstr ""
5433	+
5434	+ #: wpsc-updates/currency_list.php:31
5435	+ msgid "JPY"
5436	+ msgstr ""
5437	+
5438	#: wpsc-updates/currency_list.php:32
5439	msgid "Jamaica"
5440	msgstr ""

5443	msgid "Jamaican Dollar"
5444	msgstr ""
5445
5446	+ #: wpsc-updates/currency_list.php:32
5447	+ msgid "JMD"
5448	+ msgstr ""
5449	+
5450	#: wpsc-updates/currency_list.php:33
5451	msgid "Ivory Coast"
5452	msgstr ""

5467	msgid "Israeli New Shekel"
5468	msgstr ""
5469
5470	+ #: wpsc-updates/currency_list.php:36
5471	+ msgid "ILS"
5472	+ msgstr ""
5473	+
5474	#: wpsc-updates/currency_list.php:37
5475	msgid "Ireland"
5476	msgstr ""

5483	msgid "Iraqi Dinar"
5484	msgstr ""
5485
5486	+ #: wpsc-updates/currency_list.php:38
5487	+ msgid "IQD"
5488	+ msgstr ""
5489	+
5490	#: wpsc-updates/currency_list.php:39
5491	msgid "Indonesia"
5492	msgstr ""

5495	msgid "Indonesian Rupiah"
5496	msgstr ""
5497
5498	+ #: wpsc-updates/currency_list.php:39
5499	+ msgid "IDR"
5500	+ msgstr ""
5501	+
5502	#: wpsc-updates/currency_list.php:40
5503	msgid "Iran"
5504	msgstr ""

5507	msgid "Iranian Rial"
5508	msgstr ""
5509
5510	+ #: wpsc-updates/currency_list.php:40
5511	+ msgid "IRR"
5512	+ msgstr ""
5513	+
5514	#: wpsc-updates/currency_list.php:41
5515	msgid "India"
5516	msgstr ""

5519	msgid "Indian Rupee"
5520	msgstr ""
5521
5522	+ #: wpsc-updates/currency_list.php:41
5523	+ msgid "INR"
5524	+ msgstr ""
5525	+
5526	#: wpsc-updates/currency_list.php:42
5527	msgid "Iceland"
5528	msgstr ""

5531	msgid "Iceland Krona"
5532	msgstr ""
5533
5534	+ #: wpsc-updates/currency_list.php:42
5535	+ msgid "ISK"
5536	+ msgstr ""
5537	+
5538	#: wpsc-updates/currency_list.php:43
5539	msgid "Hungary"
5540	msgstr ""

5543	msgid "Hungarian Forint"
5544	msgstr ""
5545
5546	+ #: wpsc-updates/currency_list.php:43
5547	+ msgid "HUF"
5548	+ msgstr ""
5549	+
5550	#: wpsc-updates/currency_list.php:44
5551	msgid "Hong Kong"
5552	msgstr ""

5555	msgid "Hong Kong Dollar"
5556	msgstr ""
5557
5558	+ #: wpsc-updates/currency_list.php:44
5559	+ msgid "HKD"
5560	+ msgstr ""
5561	+
5562	#: wpsc-updates/currency_list.php:45
5563	msgid "Honduras"
5564	msgstr ""

5567	msgid "Honduran Lempira"
5568	msgstr ""
5569
5570	+ #: wpsc-updates/currency_list.php:45
5571	+ msgid "HNL"
5572	+ msgstr ""
5573	+
5574	#: wpsc-updates/currency_list.php:46
5575	msgid "Heard Island and McDonald Islands"
5576	msgstr ""

5583	msgid "Haitian Gourde"
5584	msgstr ""
5585
5586	+ #: wpsc-updates/currency_list.php:47
5587	+ msgid "HTG"
5588	+ msgstr ""
5589	+
5590	#: wpsc-updates/currency_list.php:48
5591	msgid "Guyana"
5592	msgstr ""

5595	msgid "Guyana Dollar"
5596	msgstr ""
5597
5598	+ #: wpsc-updates/currency_list.php:48
5599	+ msgid "GYD"
5600	+ msgstr ""
5601	+
5602	#: wpsc-updates/currency_list.php:49
5603	msgid "Guinea Bissau"
5604	msgstr ""

5607	msgid "Guinea-Bissau Peso"
5608	msgstr ""
5609
5610	+ #: wpsc-updates/currency_list.php:49
5611	+ msgid "GWP"
5612	+ msgstr ""
5613	+
5614	#: wpsc-updates/currency_list.php:50
5615	msgid "Guinea"
5616	msgstr ""

5619	msgid "Guinea Franc"
5620	msgstr ""
5621
5622	+ #: wpsc-updates/currency_list.php:50
5623	+ msgid "GNF"
5624	+ msgstr ""
5625	+
5626	#: wpsc-updates/currency_list.php:51
5627	msgid "Guernsey"
5628	msgstr ""

5635	msgid "Guatemalan Quetzal"
5636	msgstr ""
5637
5638	+ #: wpsc-updates/currency_list.php:52
5639	+ msgid "QTQ"
5640	+ msgstr ""
5641	+
5642	#: wpsc-updates/currency_list.php:53
5643	msgid "Guam (USA)"
5644	msgstr ""

5651	msgid "East Carribean Dollar"
5652	msgstr ""
5653
5654	+ #: wpsc-updates/currency_list.php:54 wpsc-updates/currency_list.php:79
5655	+ #: wpsc-updates/currency_list.php:128 wpsc-updates/currency_list.php:130
5656	+ #: wpsc-updates/currency_list.php:147 wpsc-updates/currency_list.php:184
5657	+ #: wpsc-updates/currency_list.php:185 wpsc-updates/currency_list.php:187
5658	+ msgid "XCD"
5659	+ msgstr ""
5660	+
5661	#: wpsc-updates/currency_list.php:55
5662	msgid "Guadeloupe (French)"
5663	msgstr ""

5671	msgid "Danish Krone"
5672	msgstr ""
5673
5674	+ #: wpsc-updates/currency_list.php:56 wpsc-updates/currency_list.php:68
5675	+ #: wpsc-updates/currency_list.php:81
5676	+ msgid "DKK"
5677	+ msgstr ""
5678	+
5679	#: wpsc-updates/currency_list.php:57
5680	msgid "Greece"
5681	msgstr ""

5688	msgid "Gibraltar Pound"
5689	msgstr ""
5690
5691	+ #: wpsc-updates/currency_list.php:58
5692	+ msgid "GIP"
5693	+ msgstr ""
5694	+
5695	#: wpsc-updates/currency_list.php:59
5696	msgid "Ghana"
5697	msgstr ""

5700	msgid "Ghanaian Cedi"
5701	msgstr ""
5702
5703	+ #: wpsc-updates/currency_list.php:59
5704	+ msgid "GHC"
5705	+ msgstr ""
5706	+
5707	#: wpsc-updates/currency_list.php:60
5708	msgid "Germany"
5709	msgstr ""

5716	msgid "Georgian Lari"
5717	msgstr ""
5718
5719	+ #: wpsc-updates/currency_list.php:61
5720	+ msgid "GEL"
5721	+ msgstr ""
5722	+
5723	#: wpsc-updates/currency_list.php:62
5724	msgid "Gambia"
5725	msgstr ""

5728	msgid "Gambian Dalasi"
5729	msgstr ""
5730
5731	+ #: wpsc-updates/currency_list.php:62
5732	+ msgid "GMD"
5733	+ msgstr ""
5734	+
5735	#: wpsc-updates/currency_list.php:63
5736	msgid "Gabon"
5737	msgstr ""

5742	msgid "CFA Franc BEAC"
5743	msgstr ""
5744
5745	+ #: wpsc-updates/currency_list.php:63 wpsc-updates/currency_list.php:73
5746	+ #: wpsc-updates/currency_list.php:89 wpsc-updates/currency_list.php:96
5747	+ #: wpsc-updates/currency_list.php:97 wpsc-updates/currency_list.php:100
5748	+ msgid "XAF"
5749	+ msgstr ""
5750	+
5751	#: wpsc-updates/currency_list.php:64
5752	msgid "French Southern Territories"
5753	msgstr ""

5768	msgid "Fiji Dollar"
5769	msgstr ""
5770
5771	+ #: wpsc-updates/currency_list.php:67
5772	+ msgid "FJD"
5773	+ msgstr ""
5774	+
5775	#: wpsc-updates/currency_list.php:68
5776	msgid "Faroe Islands"
5777	msgstr ""

5784	msgid "Falkland Islands Pound"
5785	msgstr ""
5786
5787	+ #: wpsc-updates/currency_list.php:69
5788	+ msgid "FKP"
5789	+ msgstr ""
5790	+
5791	#: wpsc-updates/currency_list.php:70
5792	msgid "Ethiopia"
5793	msgstr ""

5796	msgid "Ethiopian Birr"
5797	msgstr ""
5798
5799	+ #: wpsc-updates/currency_list.php:70
5800	+ msgid "ETB"
5801	+ msgstr ""
5802	+
5803	#: wpsc-updates/currency_list.php:71
5804	msgid "Estonia"
5805	msgstr ""

5808	msgid "Estonian Kroon"
5809	msgstr ""
5810
5811	+ #: wpsc-updates/currency_list.php:71
5812	+ msgid "EEK"
5813	+ msgstr ""
5814	+
5815	#: wpsc-updates/currency_list.php:72
5816	msgid "Eritrea"
5817	msgstr ""

5820	msgid "Eritrean Nakfa"
5821	msgstr ""
5822
5823	+ #: wpsc-updates/currency_list.php:72
5824	+ msgid "ERN"
5825	+ msgstr ""
5826	+
5827	#: wpsc-updates/currency_list.php:73
5828	msgid "Equatorial Guinea"
5829	msgstr ""

5836	msgid "El Salvador Colon"
5837	msgstr ""
5838
5839	+ #: wpsc-updates/currency_list.php:74
5840	+ msgid "SVC"
5841	+ msgstr ""
5842	+
5843	#: wpsc-updates/currency_list.php:75
5844	msgid "Egypt"
5845	msgstr ""

5848	msgid "Egyptian Pound"
5849	msgstr ""
5850
5851	+ #: wpsc-updates/currency_list.php:75
5852	+ msgid "EGP"
5853	+ msgstr ""
5854	+
5855	#: wpsc-updates/currency_list.php:76
5856	msgid "Ecuador"
5857	msgstr ""

5860	msgid "Ecuador Sucre"
5861	msgstr ""
5862
5863	+ #: wpsc-updates/currency_list.php:76
5864	+ msgid "ECS"
5865	+ msgstr ""
5866	+
5867	#: wpsc-updates/currency_list.php:77
5868	msgid "East Timor"
5869	msgstr ""

5872	msgid "Timor Escudo"
5873	msgstr ""
5874
5875	+ #: wpsc-updates/currency_list.php:77
5876	+ msgid "TPE"
5877	+ msgstr ""
5878	+
5879	#: wpsc-updates/currency_list.php:78
5880	msgid "Dominican Republic"
5881	msgstr ""

5884	msgid "Dominican Peso"
5885	msgstr ""
5886
5887	+ #: wpsc-updates/currency_list.php:78
5888	+ msgid "DOP"
5889	+ msgstr ""
5890	+
5891	#: wpsc-updates/currency_list.php:79
5892	msgid "Dominica"
5893	msgstr ""

5907	msgid "Djibouti Franc"
5908	msgstr ""
5909
5910	+ #: wpsc-updates/currency_list.php:80
5911	+ msgid "DJF"
5912	+ msgstr ""
5913	+
5914	#: wpsc-updates/currency_list.php:81
5915	msgid "Denmark"
5916	msgstr ""

5923	msgid "Francs"
5924	msgstr ""
5925
5926	+ #: wpsc-updates/currency_list.php:82
5927	+ msgid "CDF"
5928	+ msgstr ""
5929	+
5930	#: wpsc-updates/currency_list.php:83
5931	msgid "Czech Rep."
5932	msgstr ""

5935	msgid "Czech Koruna"
5936	msgstr ""
5937
5938	+ #: wpsc-updates/currency_list.php:83
5939	+ msgid "CZK"
5940	+ msgstr ""
5941	+
5942	#: wpsc-updates/currency_list.php:84
5943	msgid "Cyprus"
5944	msgstr ""

5947	msgid "Cyprus Pound"
5948	msgstr ""
5949
5950	+ #: wpsc-updates/currency_list.php:84
5951	+ msgid "CYP"
5952	+ msgstr ""
5953	+
5954	#: wpsc-updates/currency_list.php:85
5955	msgid "Cuba"
5956	msgstr ""

5959	msgid "Cuban Peso"
5960	msgstr ""
5961
5962	+ #: wpsc-updates/currency_list.php:85
5963	+ msgid "CUP"
5964	+ msgstr ""
5965	+
5966	#: wpsc-updates/currency_list.php:86
5967	msgid "Croatia"
5968	msgstr ""

5971	msgid "Croatian Kuna"
5972	msgstr ""
5973
5974	+ #: wpsc-updates/currency_list.php:86
5975	+ msgid "HRK"
5976	+ msgstr ""
5977	+
5978	#: wpsc-updates/currency_list.php:87
5979	msgid "Costa Rica"
5980	msgstr ""

5983	msgid "Costa Rican Colon"
5984	msgstr ""
5985
5986	+ #: wpsc-updates/currency_list.php:87
5987	+ msgid "CRC"
5988	+ msgstr ""
5989	+
5990	#: wpsc-updates/currency_list.php:88
5991	msgid "Cook Islands"
5992	msgstr ""

5997	msgid "New Zealand Dollar"
5998	msgstr ""
5999
6000	+ #: wpsc-updates/currency_list.php:88 wpsc-updates/currency_list.php:157
6001	+ #: wpsc-updates/currency_list.php:161 wpsc-updates/currency_list.php:173
6002	+ #: wpsc-updates/currency_list.php:216
6003	+ msgid "NZD"
6004	+ msgstr ""
6005	+
6006	#: wpsc-updates/currency_list.php:89
6007	msgid "Congo"
6008	msgstr ""

6015	msgid "Comoros Franc"
6016	msgstr ""
6017
6018	+ #: wpsc-updates/currency_list.php:90
6019	+ msgid "KMF"
6020	+ msgstr ""
6021	+
6022	#: wpsc-updates/currency_list.php:91
6023	msgid "Colombia"
6024	msgstr ""

6027	msgid "Colombian Peso"
6028	msgstr ""
6029
6030	+ #: wpsc-updates/currency_list.php:91
6031	+ msgid "COP"
6032	+ msgstr ""
6033	+
6034	#: wpsc-updates/currency_list.php:92
6035	msgid "Cocos (Keeling) Islands"
6036	msgstr ""

6047	msgid "Chilean Peso"
6048	msgstr ""
6049
6050	+ #: wpsc-updates/currency_list.php:94
6051	+ msgid "CLP"
6052	+ msgstr ""
6053	+
6054	#: wpsc-updates/currency_list.php:95
6055	msgid "China"
6056	msgstr ""

6059	msgid "Yuan Renminbi"
6060	msgstr ""
6061
6062	+ #: wpsc-updates/currency_list.php:95
6063	+ msgid "CNY"
6064	+ msgstr ""
6065	+
6066	#: wpsc-updates/currency_list.php:96
6067	msgid "Chad"
6068	msgstr ""

6079	msgid "Cayman Islands Dollar"
6080	msgstr ""
6081
6082	+ #: wpsc-updates/currency_list.php:98
6083	+ msgid "KYD"
6084	+ msgstr ""
6085	+
6086	#: wpsc-updates/currency_list.php:99
6087	msgid "Cape Verde"
6088	msgstr ""

6091	msgid "Cape Verde Escudo"
6092	msgstr ""
6093
6094	+ #: wpsc-updates/currency_list.php:99
6095	+ msgid "CVE"
6096	+ msgstr ""
6097	+
6098	#: wpsc-updates/currency_list.php:100
6099	msgid "Cameroon"
6100	msgstr ""

6107	msgid "Canadian Dollar"
6108	msgstr ""
6109
6110	+ #: wpsc-updates/currency_list.php:101
6111	+ msgid "CAD"
6112	+ msgstr ""
6113	+
6114	#: wpsc-updates/currency_list.php:102
6115	msgid "Cambodia"
6116	msgstr ""

6119	msgid "Kampuchean Riel"
6120	msgstr ""
6121
6122	+ #: wpsc-updates/currency_list.php:102
6123	+ msgid "KHR"
6124	+ msgstr ""
6125	+
6126	#: wpsc-updates/currency_list.php:103
6127	msgid "Burundi"
6128	msgstr ""

6131	msgid "Burundi Franc"
6132	msgstr ""
6133
6134	+ #: wpsc-updates/currency_list.php:103
6135	+ msgid "BIF"
6136	+ msgstr ""
6137	+
6138	#: wpsc-updates/currency_list.php:104
6139	msgid "Burkina Faso"
6140	msgstr ""

6147	msgid "Bulgarian Lev"
6148	msgstr ""
6149
6150	+ #: wpsc-updates/currency_list.php:105
6151	+ msgid "BGL"
6152	+ msgstr ""
6153	+
6154	#: wpsc-updates/currency_list.php:106
6155	msgid "Brunei Darussalam"
6156	msgstr ""

6159	msgid "Brunei Dollar"
6160	msgstr ""
6161
6162	+ #: wpsc-updates/currency_list.php:106
6163	+ msgid "BND"
6164	+ msgstr ""
6165	+
6166	#: wpsc-updates/currency_list.php:107
6167	msgid "British Indian Ocean Territory"
6168	msgstr ""

6172	msgstr ""
6173
6174	#: wpsc-updates/currency_list.php:108
6175	+ msgid "Brazilian Real"
6176	+ msgstr ""
6177	+
6178	+ #: wpsc-updates/currency_list.php:108
6179	+ msgid "BRL"
6180	msgstr ""
6181
6182	#: wpsc-updates/currency_list.php:109

6188	msgid "Norwegian Krone"
6189	msgstr ""
6190
6191	+ #: wpsc-updates/currency_list.php:109 wpsc-updates/currency_list.php:164
6192	+ #: wpsc-updates/currency_list.php:206
6193	+ msgid "NOK"
6194	+ msgstr ""
6195	+
6196	#: wpsc-updates/currency_list.php:110
6197	msgid "Botswana"
6198	msgstr ""

6201	msgid "Botswana Pula"
6202	msgstr ""
6203
6204	+ #: wpsc-updates/currency_list.php:110
6205	+ msgid "BWP"
6206	+ msgstr ""
6207	+
6208	#: wpsc-updates/currency_list.php:111
6209	msgid "Bosnia-Herzegovina"
6210	msgstr ""

6213	msgid "Marka"
6214	msgstr ""
6215
6216	+ #: wpsc-updates/currency_list.php:111
6217	+ msgid "BAM"
6218	+ msgstr ""
6219	+
6220	#: wpsc-updates/currency_list.php:112
6221	msgid "Bolivia"
6222	msgstr ""

6225	msgid "Boliviano"
6226	msgstr ""
6227
6228	+ #: wpsc-updates/currency_list.php:112
6229	+ msgid "BOB"
6230	+ msgstr ""
6231	+
6232	#: wpsc-updates/currency_list.php:113
6233	msgid "Bhutan"
6234	msgstr ""

6237	msgid "Bhutan Ngultrum"
6238	msgstr ""
6239
6240	+ #: wpsc-updates/currency_list.php:113
6241	+ msgid "BTN"
6242	+ msgstr ""
6243	+
6244	#: wpsc-updates/currency_list.php:114
6245	msgid "Bermuda"
6246	msgstr ""

6249	msgid "Bermudian Dollar"
6250	msgstr ""
6251
6252	+ #: wpsc-updates/currency_list.php:114
6253	+ msgid "BMD"
6254	+ msgstr ""
6255	+
6256	#: wpsc-updates/currency_list.php:115
6257	msgid "Benin"
6258	msgstr ""

6265	msgid "Belize Dollar"
6266	msgstr ""
6267
6268	+ #: wpsc-updates/currency_list.php:116
6269	+ msgid "BZD"
6270	+ msgstr ""
6271	+
6272	#: wpsc-updates/currency_list.php:117
6273	msgid "Belgium"
6274	msgstr ""

6281	msgid "Belarussian Ruble"
6282	msgstr ""
6283
6284	+ #: wpsc-updates/currency_list.php:118
6285	+ msgid "BYB"
6286	+ msgstr ""
6287	+
6288	#: wpsc-updates/currency_list.php:119
6289	msgid "Barbados"
6290	msgstr ""

6293	msgid "Barbados Dollar"
6294	msgstr ""
6295
6296	+ #: wpsc-updates/currency_list.php:119
6297	+ msgid "BBD"
6298	+ msgstr ""
6299	+
6300	#: wpsc-updates/currency_list.php:120
6301	msgid "Bangladesh"
6302	msgstr ""

6305	msgid "Bangladeshi Taka"
6306	msgstr ""
6307
6308	+ #: wpsc-updates/currency_list.php:120
6309	+ msgid "BDT"
6310	+ msgstr ""
6311	+
6312	#: wpsc-updates/currency_list.php:121
6313	msgid "Bahrain"
6314	msgstr ""

6317	msgid "Bahraini Dinar"
6318	msgstr ""
6319
6320	+ #: wpsc-updates/currency_list.php:121
6321	+ msgid "BHD"
6322	+ msgstr ""
6323	+
6324	#: wpsc-updates/currency_list.php:122
6325	msgid "Bahamas"
6326	msgstr ""

6329	msgid "Bahamian Dollar"
6330	msgstr ""
6331
6332	+ #: wpsc-updates/currency_list.php:122
6333	+ msgid "BSD"
6334	+ msgstr ""
6335	+
6336	#: wpsc-updates/currency_list.php:123
6337	msgid "Azerbaijan"
6338	msgstr ""

6341	msgid "Azerbaijanian Manat"
6342	msgstr ""
6343
6344	+ #: wpsc-updates/currency_list.php:123
6345	+ msgid "AZM"
6346	+ msgstr ""
6347	+
6348	#: wpsc-updates/currency_list.php:124
6349	msgid "Austria"
6350	msgstr ""

6357	msgid "Aruban Guilder"
6358	msgstr ""
6359
6360	+ #: wpsc-updates/currency_list.php:125
6361	+ msgid "AWG"
6362	+ msgstr ""
6363	+
6364	#: wpsc-updates/currency_list.php:126
6365	msgid "Armenia"
6366	msgstr ""

6369	msgid "Armenian Dram"
6370	msgstr ""
6371
6372	+ #: wpsc-updates/currency_list.php:126
6373	+ msgid "AMD"
6374	+ msgstr ""
6375	+
6376	#: wpsc-updates/currency_list.php:127
6377	msgid "Argentina"
6378	msgstr ""

6381	msgid "Argentine Peso"
6382	msgstr ""
6383
6384	+ #: wpsc-updates/currency_list.php:127
6385	+ msgid "ARS"
6386	+ msgstr ""
6387	+
6388	#: wpsc-updates/currency_list.php:128
6389	msgid "Antigua and Barbuda"
6390	msgstr ""

6397	msgid "Dollar"
6398	msgstr ""
6399
6400	+ #: wpsc-updates/currency_list.php:129
6401	+ msgid "ATA"
6402	+ msgstr ""
6403	+
6404	#: wpsc-updates/currency_list.php:130
6405	msgid "Anguilla"
6406	msgstr ""

6413	msgid "Angolan New Kwanza"
6414	msgstr ""
6415
6416	+ #: wpsc-updates/currency_list.php:131
6417	+ msgid "AON"
6418	+ msgstr ""
6419	+
6420	#: wpsc-updates/currency_list.php:132
6421	msgid "Andorra"
6422	msgstr ""

6433	msgid "Algerian Dinar"
6434	msgstr ""
6435
6436	+ #: wpsc-updates/currency_list.php:134
6437	+ msgid "DZD"
6438	+ msgstr ""
6439	+
6440	#: wpsc-updates/currency_list.php:135
6441	msgid "Albania"
6442	msgstr ""

6445	msgid "Albanian Lek"
6446	msgstr ""
6447
6448	+ #: wpsc-updates/currency_list.php:135
6449	+ msgid "ALL"
6450	+ msgstr ""
6451	+
6452	#: wpsc-updates/currency_list.php:136
6453	msgid "Afghanistan"
6454	msgstr ""

6457	msgid "Afghanistan Afghani"
6458	msgstr ""
6459
6460	+ #: wpsc-updates/currency_list.php:136
6461	+ msgid "AFA"
6462	+ msgstr ""
6463	+
6464	#: wpsc-updates/currency_list.php:137
6465	msgid "USA"
6466	msgstr ""

6481	msgid "Mauritius Rupee"
6482	msgstr ""
6483
6484	+ #: wpsc-updates/currency_list.php:140
6485	+ msgid "MUR"
6486	+ msgstr ""
6487	+
6488	#: wpsc-updates/currency_list.php:141
6489	msgid "Mayotte"
6490	msgstr ""

6497	msgid "Mexican Nuevo Peso"
6498	msgstr ""
6499
6500	+ #: wpsc-updates/currency_list.php:142
6501	+ msgid "MXN"
6502	+ msgstr ""
6503	+
6504	#: wpsc-updates/currency_list.php:143
6505	msgid "Micronesia"
6506	msgstr ""

6513	msgid "Moldovan Leu"
6514	msgstr ""
6515
6516	+ #: wpsc-updates/currency_list.php:144
6517	+ msgid "MDL"
6518	+ msgstr ""
6519	+
6520	#: wpsc-updates/currency_list.php:145
6521	msgid "Monaco"
6522	msgstr ""

6529	msgid "Mongolian Tugrik"
6530	msgstr ""
6531
6532	+ #: wpsc-updates/currency_list.php:146
6533	+ msgid "MNT"
6534	+ msgstr ""
6535	+
6536	#: wpsc-updates/currency_list.php:147
6537	msgid "Montserrat"
6538	msgstr ""

6545	msgid "Moroccan Dirham"
6546	msgstr ""
6547
6548	+ #: wpsc-updates/currency_list.php:148 wpsc-updates/currency_list.php:238
6549	+ msgid "MAD"
6550	+ msgstr ""
6551	+
6552	#: wpsc-updates/currency_list.php:149
6553	msgid "Mozambique"
6554	msgstr ""

6557	msgid "Mozambique Metical"
6558	msgstr ""
6559
6560	+ #: wpsc-updates/currency_list.php:149
6561	+ msgid "MZM"
6562	+ msgstr ""
6563	+
6564	#: wpsc-updates/currency_list.php:150
6565	msgid "Myanmar"
6566	msgstr ""

6569	msgid "Myanmar Kyat"
6570	msgstr ""
6571
6572	+ #: wpsc-updates/currency_list.php:150
6573	+ msgid "MMK"
6574	+ msgstr ""
6575	+
6576	#: wpsc-updates/currency_list.php:151
6577	msgid "Namibia"
6578	msgstr ""

6581	msgid "Namibian Dollar"
6582	msgstr ""
6583
6584	+ #: wpsc-updates/currency_list.php:151
6585	+ msgid "NAD"
6586	+ msgstr ""
6587	+
6588	#: wpsc-updates/currency_list.php:152
6589	msgid "Nauru"
6590	msgstr ""

6597	msgid "Nepalese Rupee"
6598	msgstr ""
6599
6600	+ #: wpsc-updates/currency_list.php:153
6601	+ msgid "NPR"
6602	+ msgstr ""
6603	+
6604	#: wpsc-updates/currency_list.php:154
6605	msgid "Netherlands"
6606	msgstr ""

6613	msgid "Netherlands Antillean Guilder"
6614	msgstr ""
6615
6616	+ #: wpsc-updates/currency_list.php:155
6617	+ msgid "ANG"
6618	+ msgstr ""
6619	+
6620	#: wpsc-updates/currency_list.php:156
6621	msgid "New Caledonia (French)"
6622	msgstr ""

6626	msgid "CFP Franc"
6627	msgstr ""
6628
6629	+ #: wpsc-updates/currency_list.php:156 wpsc-updates/currency_list.php:175
6630	+ #: wpsc-updates/currency_list.php:237
6631	+ msgid "XPF"
6632	+ msgstr ""
6633	+
6634	#: wpsc-updates/currency_list.php:157
6635	msgid "New Zealand"
6636	msgstr ""

6643	msgid "Nicaraguan Cordoba Oro"
6644	msgstr ""
6645
6646	+ #: wpsc-updates/currency_list.php:158
6647	+ msgid "NIC"
6648	+ msgstr ""
6649	+
6650	#: wpsc-updates/currency_list.php:159
6651	msgid "Niger"
6652	msgstr ""

6659	msgid "Nigerian Naira"
6660	msgstr ""
6661
6662	+ #: wpsc-updates/currency_list.php:160
6663	+ msgid "NGN"
6664	+ msgstr ""
6665	+
6666	#: wpsc-updates/currency_list.php:161
6667	msgid "Niue"
6668	msgstr ""

6687	msgid "Omani Rial"
6688	msgstr ""
6689
6690	+ #: wpsc-updates/currency_list.php:165
6691	+ msgid "OMR"
6692	+ msgstr ""
6693	+
6694	#: wpsc-updates/currency_list.php:166
6695	msgid "Pakistan"
6696	msgstr ""

6699	msgid "Pakistan Rupee"
6700	msgstr ""
6701
6702	+ #: wpsc-updates/currency_list.php:166
6703	+ msgid "PKR"
6704	+ msgstr ""
6705	+
6706	#: wpsc-updates/currency_list.php:167
6707	msgid "Palau"
6708	msgstr ""

6715	msgid "Panamanian Balboa"
6716	msgstr ""
6717
6718	+ #: wpsc-updates/currency_list.php:168
6719	+ msgid "PAB"
6720	+ msgstr ""
6721	+
6722	#: wpsc-updates/currency_list.php:169
6723	msgid "Papua New Guinea"
6724	msgstr ""

6727	msgid "Papua New Guinea Kina"
6728	msgstr ""
6729
6730	+ #: wpsc-updates/currency_list.php:169
6731	+ msgid "PGK"
6732	+ msgstr ""
6733	+
6734	#: wpsc-updates/currency_list.php:170
6735	msgid "Paraguay"
6736	msgstr ""

6739	msgid "Paraguay Guarani"
6740	msgstr ""
6741
6742	+ #: wpsc-updates/currency_list.php:170
6743	+ msgid "PYG"
6744	+ msgstr ""
6745	+
6746	#: wpsc-updates/currency_list.php:171
6747	msgid "Peru"
6748	msgstr ""

6751	msgid "Peruvian Nuevo Sol"
6752	msgstr ""
6753
6754	+ #: wpsc-updates/currency_list.php:171
6755	+ msgid "PEN"
6756	+ msgstr ""
6757	+
6758	#: wpsc-updates/currency_list.php:172
6759	msgid "Philippines"
6760	msgstr ""

6763	msgid "Philippine Peso"
6764	msgstr ""
6765
6766	+ #: wpsc-updates/currency_list.php:172
6767	+ msgid "PHP"
6768	+ msgstr ""
6769	+
6770	#: wpsc-updates/currency_list.php:173
6771	msgid "Pitcairn Island"
6772	msgstr ""

6779	msgid "Polish Zloty"
6780	msgstr ""
6781
6782	+ #: wpsc-updates/currency_list.php:174
6783	+ msgid "PLN"
6784	+ msgstr ""
6785	+
6786	#: wpsc-updates/currency_list.php:175
6787	msgid "Polynesia (French)"
6788	msgstr ""

6803	msgid "Qatari Rial"
6804	msgstr ""
6805
6806	+ #: wpsc-updates/currency_list.php:178
6807	+ msgid "QAR"
6808	+ msgstr ""
6809	+
6810	#: wpsc-updates/currency_list.php:179
6811	msgid "Reunion (French)"
6812	msgstr ""

6819	msgid "Romanian Leu"
6820	msgstr ""
6821
6822	+ #: wpsc-updates/currency_list.php:180
6823	+ msgid "RON"
6824	+ msgstr ""
6825	+
6826	#: wpsc-updates/currency_list.php:181
6827	msgid "Russia"
6828	msgstr ""

6831	msgid "Russian Ruble"
6832	msgstr ""
6833
6834	+ #: wpsc-updates/currency_list.php:181
6835	+ msgid "RUR"
6836	+ msgstr ""
6837	+
6838	#: wpsc-updates/currency_list.php:182
6839	msgid "Rwanda"
6840	msgstr ""

6843	msgid "Rwanda Franc"
6844	msgstr ""
6845
6846	+ #: wpsc-updates/currency_list.php:182
6847	+ msgid "RWF"
6848	+ msgstr ""
6849	+
6850	#: wpsc-updates/currency_list.php:183
6851	msgid "Saint Helena"
6852	msgstr ""

6855	msgid "St. Helena Pound"
6856	msgstr ""
6857
6858	+ #: wpsc-updates/currency_list.php:183
6859	+ msgid "SHP"
6860	+ msgstr ""
6861	+
6862	#: wpsc-updates/currency_list.php:184
6863	msgid "Saint Kitts & Nevis Anguilla"
6864	msgstr ""

6883	msgid "Samoan Tala"
6884	msgstr ""
6885
6886	+ #: wpsc-updates/currency_list.php:188
6887	+ msgid "WST"
6888	+ msgstr ""
6889	+
6890	#: wpsc-updates/currency_list.php:189
6891	msgid "San Marino"
6892	msgstr ""

6895	msgid "Italian Lira"
6896	msgstr ""
6897
6898	+ #: wpsc-updates/currency_list.php:189
6899	+ msgid "ITL"
6900	+ msgstr ""
6901	+
6902	#: wpsc-updates/currency_list.php:190
6903	msgid "Sao Tome and Principe"
6904	msgstr ""

6907	msgid "Dobra"
6908	msgstr ""
6909
6910	+ #: wpsc-updates/currency_list.php:190
6911	+ msgid "STD"
6912	+ msgstr ""
6913	+
6914	#: wpsc-updates/currency_list.php:191
6915	msgid "Saudi Arabia"
6916	msgstr ""

6919	msgid "Saudi Riyal"
6920	msgstr ""
6921
6922	+ #: wpsc-updates/currency_list.php:191
6923	+ msgid "SAR"
6924	+ msgstr ""
6925	+
6926	#: wpsc-updates/currency_list.php:192
6927	msgid "Senegal"
6928	msgstr ""

6935	msgid "Seychelles Rupee"
6936	msgstr ""
6937
6938	+ #: wpsc-updates/currency_list.php:193
6939	+ msgid "SCR"
6940	+ msgstr ""
6941	+
6942	#: wpsc-updates/currency_list.php:194
6943	msgid "Sierra Leone"
6944	msgstr ""

6947	msgid "Sierra Leone Leone"
6948	msgstr ""
6949
6950	+ #: wpsc-updates/currency_list.php:194
6951	+ msgid "SLL"
6952	+ msgstr ""
6953	+
6954	#: wpsc-updates/currency_list.php:195
6955	msgid "Singapore"
6956	msgstr ""

6959	msgid "Singapore Dollar"
6960	msgstr ""
6961
6962	+ #: wpsc-updates/currency_list.php:195
6963	+ msgid "SGD"
6964	+ msgstr ""
6965	+
6966	#: wpsc-updates/currency_list.php:196
6967	msgid "Slovakia"
6968	msgstr ""

6975	msgid "Slovenian Tolar"
6976	msgstr ""
6977
6978	+ #: wpsc-updates/currency_list.php:197
6979	+ msgid "SIT"
6980	+ msgstr ""
6981	+
6982	#: wpsc-updates/currency_list.php:198
6983	msgid "Solomon Islands"
6984	msgstr ""

6995	msgid "Somali Shilling"
6996	msgstr ""
6997
6998	+ #: wpsc-updates/currency_list.php:199
6999	+ msgid "SOD"
7000	+ msgstr ""
7001	+
7002	#: wpsc-updates/currency_list.php:200
7003	msgid "South Africa"
7004	msgstr ""

7007	msgid "South African Rand"
7008	msgstr ""
7009
7010	+ #: wpsc-updates/currency_list.php:200
7011	+ msgid "ZAR"
7012	+ msgstr ""
7013	+
7014	#: wpsc-updates/currency_list.php:201
7015	msgid "South Georgia & South Sandwich Islands"
7016	msgstr ""

7027	msgid "Sri Lanka Rupee"
7028	msgstr ""
7029
7030	+ #: wpsc-updates/currency_list.php:203
7031	+ msgid "LKR"
7032	+ msgstr ""
7033	+
7034	#: wpsc-updates/currency_list.php:204
7035	msgid "Sudan"
7036	msgstr ""

7039	msgid "Sudanese Dinar"
7040	msgstr ""
7041
7042	+ #: wpsc-updates/currency_list.php:204
7043	+ msgid "SDD"
7044	+ msgstr ""
7045	+
7046	#: wpsc-updates/currency_list.php:205
7047	msgid "Suriname"
7048	msgstr ""

7051	msgid "Surinam Guilder"
7052	msgstr ""
7053
7054	+ #: wpsc-updates/currency_list.php:205
7055	+ msgid "SRG"
7056	+ msgstr ""
7057	+
7058	#: wpsc-updates/currency_list.php:206
7059	msgid "Svalbard and Jan Mayen Islands"
7060	msgstr ""

7067	msgid "Swaziland Lilangeni"
7068	msgstr ""
7069
7070	+ #: wpsc-updates/currency_list.php:207
7071	+ msgid "SZL"
7072	+ msgstr ""
7073	+
7074	#: wpsc-updates/currency_list.php:208
7075	msgid "Sweden"
7076	msgstr ""

7079	msgid "Swedish Krona"
7080	msgstr ""
7081
7082	+ #: wpsc-updates/currency_list.php:208
7083	+ msgid "SEK"
7084	+ msgstr ""
7085	+
7086	#: wpsc-updates/currency_list.php:209
7087	msgid "Switzerland"
7088	msgstr ""

7095	msgid "Syrian Pound"
7096	msgstr ""
7097
7098	+ #: wpsc-updates/currency_list.php:210
7099	+ msgid "SYP"
7100	+ msgstr ""
7101	+
7102	#: wpsc-updates/currency_list.php:211
7103	msgid "Taiwan"
7104	msgstr ""

7107	msgid "Taiwan Dollar"
7108	msgstr ""
7109
7110	+ #: wpsc-updates/currency_list.php:211
7111	+ msgid "TWD"
7112	+ msgstr ""
7113	+
7114	#: wpsc-updates/currency_list.php:212
7115	msgid "Tajikistan"
7116	msgstr ""

7119	msgid "Tajik Ruble"
7120	msgstr ""
7121
7122	+ #: wpsc-updates/currency_list.php:212
7123	+ msgid "TJR"
7124	+ msgstr ""
7125	+
7126	#: wpsc-updates/currency_list.php:213
7127	msgid "Tanzania"
7128	msgstr ""

7131	msgid "Tanzanian Shilling"
7132	msgstr ""
7133
7134	+ #: wpsc-updates/currency_list.php:213
7135	+ msgid "TZS"
7136	+ msgstr ""
7137	+
7138	#: wpsc-updates/currency_list.php:214
7139	msgid "Thailand"
7140	msgstr ""

7143	msgid "Thai Baht"
7144	msgstr ""
7145
7146	+ #: wpsc-updates/currency_list.php:214
7147	+ msgid "THB"
7148	+ msgstr ""
7149	+
7150	#: wpsc-updates/currency_list.php:215
7151	msgid "Togo"
7152	msgstr ""

7163	msgid "Tongan Paʻanga"
7164	msgstr ""
7165
7166	+ #: wpsc-updates/currency_list.php:217
7167	+ msgid "TOP"
7168	+ msgstr ""
7169	+
7170	#: wpsc-updates/currency_list.php:218
7171	msgid "Trinidad and Tobago"
7172	msgstr ""

7175	msgid "Trinidad and Tobago Dollar"
7176	msgstr ""
7177
7178	+ #: wpsc-updates/currency_list.php:218
7179	+ msgid "TTD"
7180	+ msgstr ""
7181	+
7182	#: wpsc-updates/currency_list.php:219
7183	msgid "Tunisia"
7184	msgstr ""

7187	msgid "Tunisian Dollar"
7188	msgstr ""
7189
7190	+ #: wpsc-updates/currency_list.php:219
7191	+ msgid "TND"
7192	+ msgstr ""
7193	+
7194	#: wpsc-updates/currency_list.php:220
7195	msgid "Turkey"
7196	msgstr ""

7199	msgid "Turkish Lira"
7200	msgstr ""
7201
7202	+ #: wpsc-updates/currency_list.php:220
7203	+ msgid "TRL"
7204	+ msgstr ""
7205	+
7206	#: wpsc-updates/currency_list.php:221
7207	msgid "Turkmenistan"
7208	msgstr ""

7211	msgid "Manat"
7212	msgstr ""
7213
7214	+ #: wpsc-updates/currency_list.php:221
7215	+ msgid "TMM"
7216	+ msgstr ""
7217	+
7218	#: wpsc-updates/currency_list.php:222
7219	msgid "Turks and Caicos Islands"
7220	msgstr ""

7235	msgid "Uganda Shilling"
7236	msgstr ""
7237
7238	+ #: wpsc-updates/currency_list.php:225
7239	+ msgid "UGS"
7240	+ msgstr ""
7241	+
7242	#: wpsc-updates/currency_list.php:226
7243	msgid "Ukraine"
7244	msgstr ""

7247	msgid "Ukraine Hryvnia"
7248	msgstr ""
7249
7250	+ #: wpsc-updates/currency_list.php:226
7251	+ msgid "UAG"
7252	+ msgstr ""
7253	+
7254	#: wpsc-updates/currency_list.php:227
7255	msgid "United Arab Emirates"
7256	msgstr ""

7259	msgid "Arab Emirates Dirham"
7260	msgstr ""
7261
7262	+ #: wpsc-updates/currency_list.php:227
7263	+ msgid "AED"
7264	+ msgstr ""
7265	+
7266	#: wpsc-updates/currency_list.php:228
7267	msgid "Uruguay"
7268	msgstr ""

7271	msgid "Uruguayan Peso"
7272	msgstr ""
7273
7274	+ #: wpsc-updates/currency_list.php:228
7275	+ msgid "UYP"
7276	+ msgstr ""
7277	+
7278	#: wpsc-updates/currency_list.php:229
7279	msgid "USA Minor Outlying Islands"
7280	msgstr ""

7287	msgid "Uzbekistan Sum"
7288	msgstr ""
7289
7290	+ #: wpsc-updates/currency_list.php:230
7291	+ msgid "UZS"
7292	+ msgstr ""
7293	+
7294	#: wpsc-updates/currency_list.php:231
7295	msgid "Vanuatu"
7296	msgstr ""

7299	msgid "Vanuatu Vatu"
7300	msgstr ""
7301
7302	+ #: wpsc-updates/currency_list.php:231
7303	+ msgid "VUV"
7304	+ msgstr ""
7305	+
7306	#: wpsc-updates/currency_list.php:232
7307	msgid "Vatican"
7308	msgstr ""

7315	msgid "Venezuelan Bolivar"
7316	msgstr ""
7317
7318	+ #: wpsc-updates/currency_list.php:233
7319	+ msgid "VUB"
7320	+ msgstr ""
7321	+
7322	#: wpsc-updates/currency_list.php:234
7323	msgid "Vietnam"
7324	msgstr ""

7327	msgid "Vietnamese Dong"
7328	msgstr ""
7329
7330	+ #: wpsc-updates/currency_list.php:234
7331	+ msgid "VND"
7332	+ msgstr ""
7333	+
7334	#: wpsc-updates/currency_list.php:235
7335	msgid "Virgin Islands (British)"
7336	msgstr ""

7355	msgid "Yemeni Rial"
7356	msgstr ""
7357
7358	+ #: wpsc-updates/currency_list.php:239
7359	+ msgid "YER"
7360	+ msgstr ""
7361	+
7362	#: wpsc-updates/currency_list.php:240
7363	msgid "Yugoslavia"
7364	msgstr ""

7367	msgid "Yugoslav New Dinar"
7368	msgstr ""
7369
7370	+ #: wpsc-updates/currency_list.php:240
7371	+ msgid "YUN"
7372	+ msgstr ""
7373	+
7374	#: wpsc-updates/currency_list.php:241
7375	msgid "Zambia"
7376	msgstr ""

7379	msgid "Zambian Kwacha"
7380	msgstr ""
7381
7382	+ #: wpsc-updates/currency_list.php:241
7383	+ msgid "ZMK"
7384	+ msgstr ""
7385	+
7386	#: wpsc-updates/currency_list.php:242
7387	msgid "Zimbabwe"
7388	msgstr ""

7391	msgid "Zimbabwe Dollar"
7392	msgstr ""
7393
7394	+ #: wpsc-updates/currency_list.php:242
7395	+ msgid "ZWD"
7396	+ msgstr ""
7397	+
7398	#: wpsc-updates/updating_tasks.php:4
7399	msgid ""
7400	"Your purchase from %shop_name% has just been dispatched. It should arrive "

wpsc-merchants/GoogleCheckout-XML.php CHANGED Viewed

	@@ -1,13 +1,13 @@
1	<?php
2
3	- require_once('library/googlecart.php');
4	- require_once('library/googleitem.php');
5	- require_once('library/googleshipping.php');
6	- require_once('library/googletax.php');
7	- require_once('library/googleresponse.php');
8	- require_once('library/googlemerchantcalculations.php');
9	- require_once('library/googleresult.php');
10	- require_once('library/googlerequest.php');
11
12
13	$nzshpcrt_gateways[$num]['name'] = 'Google Checkout';
	@@ -47,17 +47,19 @@ function gateway_google($fromcheckout = false){
47	$update = $wpdb->query($sql);
48	$sql = "SELECT `id` FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE sessionid=".$_SESSION['wpsc_sessionid'];
49	$purchase_log_id = $wpdb->get_var($sql);
50	- $~~sql~~ ~~= "DELETE FROM `".WPSC_TABLE_CART_CONTENTS."` WHERE purchaseid = ".$purchase_log_id;~~
51	- $~~wpdb->query($~~sql);
52	- $~~wpsc_cart~~->~~save_to_db~~($~~purchase_log_id~~);

53	if(! $update){
54	$sql = "INSERT INTO `".WPSC_TABLE_PURCHASE_LOGS."` (`totalprice`,`statusno`, `sessionid`, `user_ID`, `date`, `gateway`, `billing_country`,`shipping_country`, `base_shipping`,`shipping_method`, `shipping_option`, `plugin_version`, `discount_value`, `discount_data`) VALUES ('$total' ,'0', '".$_SESSION['wpsc_sessionid']."', '".(int)$user_ID."', UNIX_TIMESTAMP(), 'google', '{$wpsc_cart->delivery_country}', '{$wpsc_cart->selected_country}', '{$base_shipping}', '".$wpsc_cart->selected_shipping_method."', '".$wpsc_cart->selected_shipping_option."', '".WPSC_VERSION."', '{$wpsc_cart->coupons_amount}','{$wpsc_cart->coupons_name}')";
55	$wpdb->query($sql);
56	$sql = "SELECT `id` FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE sessionid=".$_SESSION['wpsc_sessionid'];
57	$purchase_log_id = $wpdb->get_var($sql);
58	- $wpsc_cart->save_to_db($purchase_log_id);
59	- }
60



61	if(get_option('permalink_structure') != '') {
62	$separator = "?";
63	} else {
	@@ -83,7 +85,6 @@ function gateway_google($fromcheckout = false){
83	$returnURL = $transact_url.$separator."sessionid=".$sessionid."&gateway=google";
84	$cart->SetContinueShoppingUrl($returnURL);
85	$cart->SetEditCartUrl(get_option('shopping_cart_url'));
86	- $no=1;
87	//new item code
88	$no = 0;
89	//google prohibited items not implemented
	@@ -110,6 +111,7 @@ function gateway_google($fromcheckout = false){
110	$cart->AddItem($cartitem["$no"]);
111	$no++;
112	}

113	//If there are coupons applied add coupon as a product with negative price
114	if($wpsc_cart->coupons_amount > 0){
115	if($google_curr != $local_currency_code) {
	@@ -129,7 +131,7 @@ function gateway_google($fromcheckout = false){
129	// Add shipping options
130	if(wpsc_uses_shipping() && $google_currency_shipping >0 ){
131	$Gfilter = new GoogleShippingFilters();
132	- $google_checkout_shipping=get_option("google_shipping_country");
133	$googleshippingcountries = count($google_checkout_shipping);
134	if($googleshippingcountries == 242){
135	$Gfilter->SetAllowedWorldArea(true);
	@@ -148,7 +150,7 @@ function gateway_google($fromcheckout = false){
148	}
149
150	$Gfilter->SetAllowUsPoBox(false);
151	- $ship_1 = new GoogleFlatRateShipping(~~'Flat Rate Shipping'~~, $google_currency_shipping);
152	$ship_1->AddShippingRestrictions($Gfilter);
153	$cart->AddShipping($ship_1);
154	}


1	<?php
2
3	+ require_once(WPSC_FILE_PATH.'/wpsc-merchants/library/googlecart.php');
4	+ require_once(WPSC_FILE_PATH.'/wpsc-merchants/library/googleitem.php');
5	+ require_once(WPSC_FILE_PATH.'/wpsc-merchants/library/googleshipping.php');
6	+ require_once(WPSC_FILE_PATH.'/wpsc-merchants/library/googletax.php');
7	+ require_once(WPSC_FILE_PATH.'/wpsc-merchants/library/googleresponse.php');
8	+ require_once(WPSC_FILE_PATH.'/wpsc-merchants/library/googlemerchantcalculations.php');
9	+ require_once(WPSC_FILE_PATH.'/wpsc-merchants/library/googleresult.php');
10	+ require_once(WPSC_FILE_PATH.'/wpsc-merchants/library/googlerequest.php');
11
12
13	$nzshpcrt_gateways[$num]['name'] = 'Google Checkout';

47	$update = $wpdb->query($sql);
48	$sql = "SELECT `id` FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE sessionid=".$_SESSION['wpsc_sessionid'];
49	$purchase_log_id = $wpdb->get_var($sql);
50	+ if( !empty($purchase_log_id) ){
51	+ $sql = "DELETE FROM `".WPSC_TABLE_CART_CONTENTS."` WHERE purchaseid = ".$purchase_log_id;
52	+ $wpdb->query($sql);
53	+ }
54	if(! $update){
55	$sql = "INSERT INTO `".WPSC_TABLE_PURCHASE_LOGS."` (`totalprice`,`statusno`, `sessionid`, `user_ID`, `date`, `gateway`, `billing_country`,`shipping_country`, `base_shipping`,`shipping_method`, `shipping_option`, `plugin_version`, `discount_value`, `discount_data`) VALUES ('$total' ,'0', '".$_SESSION['wpsc_sessionid']."', '".(int)$user_ID."', UNIX_TIMESTAMP(), 'google', '{$wpsc_cart->delivery_country}', '{$wpsc_cart->selected_country}', '{$base_shipping}', '".$wpsc_cart->selected_shipping_method."', '".$wpsc_cart->selected_shipping_option."', '".WPSC_VERSION."', '{$wpsc_cart->coupons_amount}','{$wpsc_cart->coupons_name}')";
56	$wpdb->query($sql);
57	$sql = "SELECT `id` FROM `".WPSC_TABLE_PURCHASE_LOGS."` WHERE sessionid=".$_SESSION['wpsc_sessionid'];
58	$purchase_log_id = $wpdb->get_var($sql);


59
60	+ }
61	+ $wpsc_cart->save_to_db($purchase_log_id);
62	+
63	if(get_option('permalink_structure') != '') {
64	$separator = "?";
65	} else {

85	$returnURL = $transact_url.$separator."sessionid=".$sessionid."&gateway=google";
86	$cart->SetContinueShoppingUrl($returnURL);
87	$cart->SetEditCartUrl(get_option('shopping_cart_url'));

88	//new item code
89	$no = 0;
90	//google prohibited items not implemented

111	$cart->AddItem($cartitem["$no"]);
112	$no++;
113	}
114	+ echo '<pre>'.print_r($wpsc_cart,1).'</pre>';
115	//If there are coupons applied add coupon as a product with negative price
116	if($wpsc_cart->coupons_amount > 0){
117	if($google_curr != $local_currency_code) {

131	// Add shipping options
132	if(wpsc_uses_shipping() && $google_currency_shipping >0 ){
133	$Gfilter = new GoogleShippingFilters();
134	+ $google_checkout_shipping = get_option("google_shipping_country");
135	$googleshippingcountries = count($google_checkout_shipping);
136	if($googleshippingcountries == 242){
137	$Gfilter->SetAllowedWorldArea(true);

150	}
151
152	$Gfilter->SetAllowUsPoBox(false);
153	+ $ship_1 = new GoogleFlatRateShipping($wpsc_cart->selected_shipping_method, $google_currency_shipping);
154	$ship_1->AddShippingRestrictions($Gfilter);
155	$cart->AddShipping($ship_1);
156	}

wpsc-merchants/paypal-express.merchant.php CHANGED Viewed

	@@ -9,13 +9,13 @@
9	* for internal operations.
10	*/
11	$nzshpcrt_gateways[$num] = array(
12	- 'name' => 'PayPal Express Checkout 2.0',
13	'api_version' => 2.0,
14	'image' => WPSC_URL . '/images/paypal.gif',
15	'class_name' => 'wpsc_merchant_paypal_express',
16	'has_recurring_billing' => false,
17	'wp_admin_cannot_cancel' => true,
18	- 'display_name' => 'PayPal Express',
19	'requirements' => array(
20	/// so that you can restrict merchant modules to PHP 5, if you use PHP 5 features
21	'php_version' => 4.3,
	@@ -253,32 +253,32 @@ function form_paypal_express() {
253
254	$output = "
255	<tr>
256	- <td>API Username
257	</td>
258	<td>
259	<input type='text' size='40' value='".get_option('paypal_certified_apiuser')."' name='paypal_certified_apiuser' />
260	</td>
261	</tr>
262	<tr>
263	- <td>API Password
264	</td>
265	<td>
266	<input type='text' size='40' value='".get_option('paypal_certified_apipass')."' name='paypal_certified_apipass' />
267	</td>
268	</tr>
269	<tr>
270	- <td>API Signature
271	</td>
272	<td>
273	<input type='text' size='70' value='".get_option('paypal_certified_apisign')."' name='paypal_certified_apisign' />
274	</td>
275	</tr>
276	<tr>
277	- <td>Server Type
278	</td>
279	<td>
280	- <input $serverType1 type='radio' name='paypal_certified_server_type' value='sandbox' /> Sandbox (For testing)
281	- <input $serverType2 type='radio' name='paypal_certified_server_type' value='production' /> Production
282	</td>
283	</tr>";
284
	@@ -292,10 +292,10 @@ function form_paypal_express() {
292	if($current_currency != $store_currency_code) {
293	$output .= "<tr> <td colspan='2'><strong class='form_group'>".__('Currency Converter')."</td> </tr>
294	<tr>
295	- <td colspan='2'>".__('Your website is using a currency not accepted by PayPal, select an accepted currency using the drop down menu bellow. Buyers on your site will still pay in your local currency however we will convert the currency and send the order through to PayPal using the currency you choose below.')."</td>
296	</tr>\n";
297
298	- $output .= "<tr>\n <td>Convert to </td>\n ";
299	$output .= "<td>\n <select name='paypal_curcode'>\n";
300
301	if (!isset($wpsc_gateways['wpsc_merchant_paypal_express']['supported_currencies']['currency_list']))
	@@ -375,7 +375,7 @@ function paypal_processingfunctions(){
375	<center>
376	<table width="700" align="left">
377	<tr>
378	- <td colspan="2" class="header">The PayPal API has returned an error~~!</~~td>
379	</tr>
380	';
381	//it will print if any URL errors
	@@ -420,15 +420,15 @@ function paypal_processingfunctions(){
420	$count=$count+1;
421	$_SESSION['paypalExpressMessage'] .="
422	<tr>
423	- <td>Error Number~~:</~~td>
424	<td> $errorCode </td>
425	</tr>
426	<tr>
427	- <td>Short Message~~:</~~td>
428	<td> $shortMessage </td>
429	</tr>
430	<tr>
431	- <td>Long Message~~:</~~td>
432	<td> $longMessage </td>
433	</tr>";
434
	@@ -599,44 +599,44 @@ function paypal_processingfunctions(){
599	$output ="
600	<table width='400' class='paypal_express_form'>
601	<tr>
602	- <td align='left' class='firstcol'><b>Order Total:</b></td>
603	- <td align='left'>"~~.$wpsc_cart->process_as_currency~~($_SESSION['paypalAmount']) ."</td>
604	</tr>
605	<tr>
606	- <td align='left'><b>Shipping Address: </b></td>
607	</tr>
608	<tr>
609	<td align='left' class='firstcol'>
610	- Street 1~~:</~~td>
611	<td align='left'>".$resArray['SHIPTOSTREET']."</td>
612
613	</tr>
614	<tr>
615	<td align='left' class='firstcol'>
616	- Street 2~~:</~~td>
617	<td align='left'>".$resArray['SHIPTOSTREET2']."
618	</td>
619	</tr>
620	<tr>
621	<td align='left' class='firstcol'>
622	- City~~:</~~td>
623
624	<td align='left'>".$resArray['SHIPTOCITY']."</td>
625	</tr>
626	<tr>
627	<td align='left' class='firstcol'>
628	- State~~:</~~td>
629	<td align='left'>".$resArray['SHIPTOSTATE']."</td>
630	</tr>
631	<tr>
632	<td align='left' class='firstcol'>
633	- Postal code~~:</~~td>
634
635	<td align='left'>".$resArray['SHIPTOZIP']."</td>
636	</tr>
637	<tr>
638	<td align='left' class='firstcol'>
639	- Country~~:</~~td>
640	<td align='left'>".$resArray['SHIPTOCOUNTRYNAME']."</td>
641	</tr>
642	<tr>


9	* for internal operations.
10	*/
11	$nzshpcrt_gateways[$num] = array(
12	+ 'name' => __( 'PayPal Express Checkout 2.0', 'wpsc' ),
13	'api_version' => 2.0,
14	'image' => WPSC_URL . '/images/paypal.gif',
15	'class_name' => 'wpsc_merchant_paypal_express',
16	'has_recurring_billing' => false,
17	'wp_admin_cannot_cancel' => true,
18	+ 'display_name' => __( 'PayPal Express', 'wpsc' ),
19	'requirements' => array(
20	/// so that you can restrict merchant modules to PHP 5, if you use PHP 5 features
21	'php_version' => 4.3,

253
254	$output = "
255	<tr>
256	+ <td>" . __('API Username', 'wpsc' ) . "
257	</td>
258	<td>
259	<input type='text' size='40' value='".get_option('paypal_certified_apiuser')."' name='paypal_certified_apiuser' />
260	</td>
261	</tr>
262	<tr>
263	+ <td>" . __('API Password', 'wpsc' ) . "
264	</td>
265	<td>
266	<input type='text' size='40' value='".get_option('paypal_certified_apipass')."' name='paypal_certified_apipass' />
267	</td>
268	</tr>
269	<tr>
270	+ <td>" . __('API Signature', 'wpsc' ) . "
271	</td>
272	<td>
273	<input type='text' size='70' value='".get_option('paypal_certified_apisign')."' name='paypal_certified_apisign' />
274	</td>
275	</tr>
276	<tr>
277	+ <td>" . __('Server Type', 'wpsc' ) . "
278	</td>
279	<td>
280	+ <input $serverType1 type='radio' name='paypal_certified_server_type' value='sandbox' /> " . __('Sandbox (For testing)', 'wpsc' ) . "
281	+ <input $serverType2 type='radio' name='paypal_certified_server_type' value='production' /> " . __('Production', 'wpsc' ) . "
282	</td>
283	</tr>";
284

292	if($current_currency != $store_currency_code) {
293	$output .= "<tr> <td colspan='2'><strong class='form_group'>".__('Currency Converter')."</td> </tr>
294	<tr>
295	+ <td colspan='2'>".__('Your website is using a currency not accepted by PayPal, select an accepted currency using the drop down menu bellow. Buyers on your site will still pay in your local currency however we will convert the currency and send the order through to PayPal using the currency you choose below.', 'wpsc')."</td>
296	</tr>\n";
297
298	+ $output .= "<tr>\n <td>" . __('Convert to', 'wpsc' ) . " </td>\n ";
299	$output .= "<td>\n <select name='paypal_curcode'>\n";
300
301	if (!isset($wpsc_gateways['wpsc_merchant_paypal_express']['supported_currencies']['currency_list']))

375	<center>
376	<table width="700" align="left">
377	<tr>
378	+ <td colspan="2" class="header">' . __('The PayPal API has returned an error!', 'wpsc' ) . '</td>
379	</tr>
380	';
381	//it will print if any URL errors

420	$count=$count+1;
421	$_SESSION['paypalExpressMessage'] .="
422	<tr>
423	+ <td>" . __('Error Number:', 'wpsc' ) . "</td>
424	<td> $errorCode </td>
425	</tr>
426	<tr>
427	+ <td>" . __('Short Message:', 'wpsc' ) . "</td>
428	<td> $shortMessage </td>
429	</tr>
430	<tr>
431	+ <td>" . __('Long Message:', 'wpsc' ) . "</td>
432	<td> $longMessage </td>
433	</tr>";
434

599	$output ="
600	<table width='400' class='paypal_express_form'>
601	<tr>
602	+ <td align='left' class='firstcol'><b>" . __('Error Number:', 'wpsc' ) . "Order Total:</b></td>
603	+ <td align='left'>" . wpsc_currency_display($_SESSION['paypalAmount']) . "</td>
604	</tr>
605	<tr>
606	+ <td align='left'><b>" . __('Shipping Address:', 'wpsc' ) . " </b></td>
607	</tr>
608	<tr>
609	<td align='left' class='firstcol'>
610	+ " . __('Street 1:', 'wpsc' ) . "</td>
611	<td align='left'>".$resArray['SHIPTOSTREET']."</td>
612
613	</tr>
614	<tr>
615	<td align='left' class='firstcol'>
616	+ " . __('Street 2:', 'wpsc' ) . "</td>
617	<td align='left'>".$resArray['SHIPTOSTREET2']."
618	</td>
619	</tr>
620	<tr>
621	<td align='left' class='firstcol'>
622	+ " . __('City:', 'wpsc' ) . "</td>
623
624	<td align='left'>".$resArray['SHIPTOCITY']."</td>
625	</tr>
626	<tr>
627	<td align='left' class='firstcol'>
628	+ " . __('State:', 'wpsc' ) . "</td>
629	<td align='left'>".$resArray['SHIPTOSTATE']."</td>
630	</tr>
631	<tr>
632	<td align='left' class='firstcol'>
633	+ " . __('Postal code:', 'wpsc' ) . "</td>
634
635	<td align='left'>".$resArray['SHIPTOZIP']."</td>
636	</tr>
637	<tr>
638	<td align='left' class='firstcol'>
639	+ " . __('Country:', 'wpsc' ) . "</td>
640	<td align='left'>".$resArray['SHIPTOCOUNTRYNAME']."</td>
641	</tr>
642	<tr>

wpsc-merchants/paypal-pro.merchant.php CHANGED Viewed

	@@ -324,7 +324,7 @@ function form_paypal_pro() {
324	$output = '
325	<tr>
326	<td>
327	- <label for="paypal_pro_username">' . __( 'API Username:' ) . '</label>
328	</td>
329	<td>
330	<input type="text" name="PayPalPro[username]" id="paypal_pro_username" value="' . get_option( "paypal_pro_username" ) . '" size="30" />
	@@ -332,7 +332,7 @@ function form_paypal_pro() {
332	</tr>
333	<tr>
334	<td>
335	- <label for="paypal_pro_password">' . __( 'API Password:' ) . '</label>
336	</td>
337	<td>
338	<input type="password" name="PayPalPro[password]" id="paypal_pro_password" value="' . get_option( 'paypal_pro_password' ) . '" size="16" />
	@@ -340,7 +340,7 @@ function form_paypal_pro() {
340	</tr>
341	<tr>
342	<td>
343	- <label for="paypal_pro_signature">' . __( 'API Signature:' ) . '</label>
344	</td>
345	<td>
346	<input type="text" name="PayPalPro[signature]" id="paypal_pro_signature" value="' . get_option( 'paypal_pro_signature' ) . '" size="48" />
	@@ -348,7 +348,7 @@ function form_paypal_pro() {
348	</tr>
349	<tr>
350	<td>
351	- <label for="paypal_pro_testmode">' . __( 'Test Mode Enabled:' ) . '</label>
352	</td>
353	<td>
354	<input type="hidden" name="PayPalPro[testmode]" value="off" /><input type="checkbox" name="PayPalPro[testmode]" id="paypal_pro_testmode" value="on" ' . $selected . ' />
	@@ -372,13 +372,13 @@ if ( in_array( 'wpsc_merchant_paypal_pro', (array)get_option( 'custom_gateway_op
372
373	$gateway_checkout_form_fields[$nzshpcrt_gateways[$num]['internalname']] = "
374	<tr>
375	- <td class='wpsc_CC_details'>Credit Card Number *</td>
376	<td>
377	<input type='text' value='' name='card_number' />
378	</td>
379	</tr>
380	<tr>
381	- <td class='wpsc_CC_details'>Credit Card Expiry *</td>
382	<td>
383	<select class='wpsc_ccBox' name='expiry[month]'>
384	" . $months . "
	@@ -401,18 +401,18 @@ if ( in_array( 'wpsc_merchant_paypal_pro', (array)get_option( 'custom_gateway_op
401	</td>
402	</tr>
403	<tr>
404	- <td class='wpsc_CC_details'>CVV *</td>
405	<td><input type='text' size='4' value='' maxlength='4' name='card_code' />
406	</td>
407	</tr>
408	<tr>
409	- <td class='wpsc_CC_details'>Card Type *</td>
410	<td>
411	<select class='wpsc_ccBox' name='cctype'>
412	- <option value='Visa'>Visa</option>
413	- <option value='Mastercard'>MasterCard</option>
414	- <option value='Discover'>Discover</option>
415	- <option value='Amex'>Amex</option>
416	</select>
417	</td>
418	</tr>


324	$output = '
325	<tr>
326	<td>
327	+ <label for="paypal_pro_username">' . __( 'API Username:', 'wpsc' ) . '</label>
328	</td>
329	<td>
330	<input type="text" name="PayPalPro[username]" id="paypal_pro_username" value="' . get_option( "paypal_pro_username" ) . '" size="30" />

332	</tr>
333	<tr>
334	<td>
335	+ <label for="paypal_pro_password">' . __( 'API Password:', 'wpsc' ) . '</label>
336	</td>
337	<td>
338	<input type="password" name="PayPalPro[password]" id="paypal_pro_password" value="' . get_option( 'paypal_pro_password' ) . '" size="16" />

340	</tr>
341	<tr>
342	<td>
343	+ <label for="paypal_pro_signature">' . __( 'API Signature:', 'wpsc' ) . '</label>
344	</td>
345	<td>
346	<input type="text" name="PayPalPro[signature]" id="paypal_pro_signature" value="' . get_option( 'paypal_pro_signature' ) . '" size="48" />

348	</tr>
349	<tr>
350	<td>
351	+ <label for="paypal_pro_testmode">' . __( 'Test Mode Enabled:', 'wpsc' ) . '</label>
352	</td>
353	<td>
354	<input type="hidden" name="PayPalPro[testmode]" value="off" /><input type="checkbox" name="PayPalPro[testmode]" id="paypal_pro_testmode" value="on" ' . $selected . ' />

372
373	$gateway_checkout_form_fields[$nzshpcrt_gateways[$num]['internalname']] = "
374	<tr>
375	+ <td class='wpsc_CC_details'>" . __( 'Credit Card Number *', 'wpsc' ) . "</td>
376	<td>
377	<input type='text' value='' name='card_number' />
378	</td>
379	</tr>
380	<tr>
381	+ <td class='wpsc_CC_details'>" . __( 'Credit Card Expiry *', 'wpsc' ) . "</td>
382	<td>
383	<select class='wpsc_ccBox' name='expiry[month]'>
384	" . $months . "

401	</td>
402	</tr>
403	<tr>
404	+ <td class='wpsc_CC_details'>" . __( 'CVV *', 'wpsc' ) . "</td>
405	<td><input type='text' size='4' value='' maxlength='4' name='card_code' />
406	</td>
407	</tr>
408	<tr>
409	+ <td class='wpsc_CC_details'>" . __( 'Card Type *', 'wpsc' ) . "</td>
410	<td>
411	<select class='wpsc_ccBox' name='cctype'>
412	+ <option value='Visa'>" . __( 'Visa', 'wpsc' ) . "</option>
413	+ <option value='Mastercard'>" . __( 'MasterCard', 'wpsc' ) . "</option>
414	+ <option value='Discover'>" . __( 'Discover', 'wpsc' ) . "</option>
415	+ <option value='Amex'>" . __( 'Amex', 'wpsc' ) . "</option>
416	</select>
417	</td>
418	</tr>

wpsc-shipping/australiapost.php CHANGED Viewed

	@@ -90,6 +90,7 @@ class australiapost {
90	}
91
92	function getForm() {

93	// Only for Australian merchants
94	if ($this->base_country != 'AU') {
95	return __('This shipping module only works if the base country in settings, region is set to Australia.', 'wpsc');


90	}
91
92	function getForm() {
93	+ $output = '';
94	// Only for Australian merchants
95	if ($this->base_country != 'AU') {
96	return __('This shipping module only works if the base country in settings, region is set to Australia.', 'wpsc');

wpsc-shipping/flatrate.php CHANGED Viewed

	@@ -52,26 +52,26 @@ class flatrate {
52
53	switch (get_option('base_country')) {
54	case 'NZ':
55	- $output .= "<tr class='rate_row'><td>South Island</td><td>$<input type='text' size='4' name='shipping[southisland]' value='{$shipping['southisland']}'></td></tr>";
56	- $output .= "<tr class='rate_row'><td>North Island</td><td>$<input type='text' size='4' name='shipping[northisland]' value='{$shipping['northisland']}'></td></tr>";
57	break;
58
59	case 'US':
60	- $output .= "<tr class='rate_row'><td>Continental 48 States</td><td>$<input type='text' size='4' name='shipping[continental]' value='{$shipping['continental']}'></td></tr>";
61	- $output .= "<tr class='rate_row'><td>All 50 States</td><td>$<input type='text' size='4' name='shipping[all]' value='{$shipping['all']}'></td></tr>";
62	break;
63
64	default:
65	- $output .= "<td>$<input type='text' name='shipping[local]' size='4' value='{$shipping['local']}'></td></tr>";
66	break;
67	}
68
69	$output.= "<tr ><td colspan='2'><strong>Base International</strong></td></tr>";
70	- $output .= "<tr class='rate_row'><td>North America</td><td>$<input size='4' type='text' name='shipping[northamerica]' value='{$shipping['northamerica']}'></td></tr>";
71	- $output .= "<tr class='rate_row'><td>South America</td><td>$<input size='4' type='text' name='shipping[southamerica]' value='{$shipping['southamerica']}'></td></tr>";
72	- $output .= "<tr class='rate_row'><td>Asia and Pacific</td><td>$<input size='4' type='text' name='shipping[asiapacific]' value='{$shipping['asiapacific']}'></td></tr>";
73	- $output .= "<tr class='rate_row'><td>Europe</td><td>$<input type='text' size='4' name='shipping[europe]' value='{$shipping['europe']}'></td></tr>";
74	- $output .= "<tr class='rate_row'><td>Africa</td><td>$<input type='text' size='4' name='shipping[africa]' value='{$shipping['africa']}'></td></tr>";
75	return $output;
76	}
77
	@@ -140,25 +140,25 @@ class flatrate {
140	switch ($country) {
141	case 'NZ':
142	if (strlen($flatrates['northisland']) > 0) {
143	- $shipping_quotes["North Island"] = $flatrates['northisland'];
144	}
145	if (strlen($flatrates['southisland']) > 0) {
146	- $shipping_quotes["South Island"] = $flatrates['southisland'];
147	}
148	break;
149
150	case 'US':
151	if (strlen($flatrates['continental']) > 0) {
152	- $shipping_quotes["Continental 48 States"] = $flatrates['continental'];
153	}
154	if (strlen($flatrates['all']) > 0) {
155	- $shipping_quotes["All 50 States"] = $flatrates['all'];
156	}
157	break;
158
159	default:
160	if (strlen($flatrates['local']) > 0) {
161	- $shipping_quotes["Local Shipping"] = $flatrates['local'];
162	}
163	break;
164	}


52
53	switch (get_option('base_country')) {
54	case 'NZ':
55	+ $output .= "<tr class='rate_row'><td>South Island</td><td>$<input type='text' size='4' name='shipping[southisland]' value='".esc_attr($shipping['southisland'])."'></td></tr>";
56	+ $output .= "<tr class='rate_row'><td>North Island</td><td>$<input type='text' size='4' name='shipping[northisland]' value='".esc_attr($shipping['northisland'])."'></td></tr>";
57	break;
58
59	case 'US':
60	+ $output .= "<tr class='rate_row'><td>Continental 48 States</td><td>$<input type='text' size='4' name='shipping[continental]' value='".esc_attr($shipping['continental'])."'></td></tr>";
61	+ $output .= "<tr class='rate_row'><td>All 50 States</td><td>$<input type='text' size='4' name='shipping[all]' value='".esc_attr($shipping['all'])."'></td></tr>";
62	break;
63
64	default:
65	+ $output .= "<td>$<input type='text' name='shipping[local]' size='4' value='".esc_attr($shipping['local'])."'></td></tr>";
66	break;
67	}
68
69	$output.= "<tr ><td colspan='2'><strong>Base International</strong></td></tr>";
70	+ $output .= "<tr class='rate_row'><td>North America</td><td>$<input size='4' type='text' name='shipping[northamerica]' value='".esc_attr($shipping['northamerica'])."'></td></tr>";
71	+ $output .= "<tr class='rate_row'><td>South America</td><td>$<input size='4' type='text' name='shipping[southamerica]' value='".esc_attr($shipping['southamerica'])."'></td></tr>";
72	+ $output .= "<tr class='rate_row'><td>Asia and Pacific</td><td>$<input size='4' type='text' name='shipping[asiapacific]' value='".esc_attr($shipping['asiapacific'])."'></td></tr>";
73	+ $output .= "<tr class='rate_row'><td>Europe</td><td>$<input type='text' size='4' name='shipping[europe]' value='".esc_attr($shipping['europe'])."'></td></tr>";
74	+ $output .= "<tr class='rate_row'><td>Africa</td><td>$<input type='text' size='4' name='shipping[africa]' value='".esc_attr($shipping['africa'])."'></td></tr>";
75	return $output;
76	}
77

140	switch ($country) {
141	case 'NZ':
142	if (strlen($flatrates['northisland']) > 0) {
143	+ $shipping_quotes["North Island"] = esc_attr($flatrates['northisland']);
144	}
145	if (strlen($flatrates['southisland']) > 0) {
146	+ $shipping_quotes["South Island"] = esc_attr($flatrates['southisland']);
147	}
148	break;
149
150	case 'US':
151	if (strlen($flatrates['continental']) > 0) {
152	+ $shipping_quotes["Continental 48 States"] = esc_attr($flatrates['continental']);
153	}
154	if (strlen($flatrates['all']) > 0) {
155	+ $shipping_quotes["All 50 States"] = esc_attr($flatrates['all']);
156	}
157	break;
158
159	default:
160	if (strlen($flatrates['local']) > 0) {
161	+ $shipping_quotes["Local Shipping"] = esc_attr($flatrates['local']);
162	}
163	break;
164	}

wpsc-shipping/tablerate.php CHANGED Viewed

	@@ -46,7 +46,7 @@ class tablerate {
46	* @return unknown
47	*/
48	function getForm() {
49	-
50	$output.="<tr><th>".__('Total Price', 'wpsc')."</th><th>".__('Shipping Price', 'wpsc')."</th></tr>";
51	$layers = get_option("table_rate_layers");
52
	@@ -69,7 +69,7 @@ class tablerate {
69	}
70	}
71	$output.="<input type='hidden' name='checkpage' value='table'>";
72	- $output.="<tr class='addlayer'><td colspan='2'>Layers: <a href='' style='cursor:pointer;' id='addlayer' >Add Layer</a></td></tr>";
73	return $output;
74	}
75
	@@ -80,15 +80,15 @@ class tablerate {
80	*/
81	function submit_form() {
82	if (!isset($_POST['layer'])) $_POST['layer'] = '';
83	-
84	$layers = (array)$_POST['layer'];
85	$shippings = (array)$_POST['shipping'];

86	if ($shippings != '') {
87	foreach ($shippings as $key => $price) {
88	- if ($price == '') {
89	unset($shippings[$key]);
90	unset($layers[$key]);
91	- } ~~else~~ {
92	$new_layer[$layers[$key]] = $price;
93	}
94	}


46	* @return unknown
47	*/
48	function getForm() {
49	+ $output = "";
50	$output.="<tr><th>".__('Total Price', 'wpsc')."</th><th>".__('Shipping Price', 'wpsc')."</th></tr>";
51	$layers = get_option("table_rate_layers");
52

69	}
70	}
71	$output.="<input type='hidden' name='checkpage' value='table'>";
72	+ $output.="<tr class='addlayer'><td colspan='2'>Layers: <a href='' style='cursor:pointer;' id='addlayer' >" . __('Add Layer', 'wpsc') . "</a></td></tr>";
73	return $output;
74	}
75

80	*/
81	function submit_form() {
82	if (!isset($_POST['layer'])) $_POST['layer'] = '';

83	$layers = (array)$_POST['layer'];
84	$shippings = (array)$_POST['shipping'];
85	+ $new_layer = array();
86	if ($shippings != '') {
87	foreach ($shippings as $key => $price) {
88	+ if ( empty( $price ) ) {
89	unset($shippings[$key]);
90	unset($layers[$key]);
91	+ } elseif(isset($layers[$key])) {
92	$new_layer[$layers[$key]] = $price;
93	}
94	}

wpsc-shipping/{ups.php → ups_20.php} RENAMED Viewed

	@@ -1,32 +1,42 @@
1	<?php
2	- /* Author : Greg Gullett and Instinct.co.nz
3	- * SVN : UPS Trunk : ~~Revision 15 : July 31, 2010~~

4	*/
5	- class ~~ups~~ {
6	var $internal_name, $name;
7	- ~~public~~ $service_url = "";
8	- ~~private~~ $Services = "";
9	-
10	- ~~function~~ ~~ups() {~~
11	- ~~$this->internal_name = "ups";~~
12	- ~~$this->name="UPS";~~
13	- $~~this->is_external=true~~;
14	- $this->~~requires_curl~~=~~true~~;
15	- $this->~~requires_weight~~=~~true~~;
16	- $this->~~needs_zipcode~~=true;








17
18	- ~~//$this->_includeUPSData~~();
19	- ~~//$~~this->~~_setServiceURL()~~;

20
21	- ~~return~~ ~~true;~~


22	}
23
24	private function _setServiceURL(){
25	global $wpdb;
26	$wpsc_ups_settings = get_option("wpsc_ups_settings");
27	- $wpsc_ups_environment = '';
28	- if(!empty($wpsc_ups_settings))
29	- $wpsc_ups_environment = (array_key_exists("upsenvironment",$wpsc_ups_settings)) ? $wpsc_ups_settings["upsenvironment"] : "1";
30	if ($wpsc_ups_environment == "1"){
31	$this->service_url = "https://wwwcie.ups.com/ups.app/xml/Rate";
32	}else{
	@@ -57,7 +67,7 @@ class ups {
57	"01" => "Daily Pickup, with UPS Account",
58	"03" => "No Daily Pickup, with No or Other Account",
59	"04" => "Retail Outlet (Only US origin shipments)"
60	- );
61
62	$this->Services = array(
63	"14" => "Next Day Air Early AM",
	@@ -81,13 +91,9 @@ class ups {
81	}
82
83	function getForm(){
84	-
85	- if (!isset($this->Services) \|\| !isset($this->drop_types)){
86	$this->_includeUPSData();
87	}
88	- if (!isset($this->service_url)){
89	- $this->_setServiceURL();
90	- }
91
92	//__('Your Packaging', 'wpsc'); <-- use to translate
93	$wpsc_ups_settings = get_option("wpsc_ups_settings");
	@@ -141,7 +147,7 @@ class ups {
141	$sel2_drop = "01";
142	}else{ $sel2_drop = $wpsc_ups_settings['DropoffType']; }
143
144	- foreach(array_keys($this->drop_types) as $dkey){
145	$sel = "";
146	if ($sel2_drop == $dkey){
147	$sel = 'selected="selected"';
	@@ -193,10 +199,9 @@ class ups {
193	$output .= "</tr>\n\r";
194
195	$selected_env = $wpsc_ups_settings['upsenvironment'];
196	- if ($selected_env == "1")
197	$env_test = "checked=\"checked\"";
198	- ~~else~~
199	- $env_test = "";
200	$output .= ("
201	<tr>
202	<td><label for=\"ups_env_test\" >".__('Use Testing Environment', 'wpsc')."</label></td>
	@@ -218,6 +223,31 @@ class ups {
218	</td>
219	</tr>
220	");

























221	$output .= ("
222	<tr>
223	<td>
	@@ -284,7 +314,7 @@ class ups {
284	/* This function is called when the user hit "submit" in the
285	* UPS settings area under Shipping to update the setttings.
286	*/
287	- if (isset($_POST['wpsc_ups_settings']) && $_POST['wpsc_ups_settings'] != '') {
288	$wpsc_ups_services = $_POST['wpsc_ups_services'];
289	update_option('wpsc_ups_services',$wpsc_ups_services);
290	$temp = $_POST['wpsc_ups_settings'];
	@@ -304,9 +334,13 @@ class ups {
304	$xml = "";
305	if (is_array($data)){
306	foreach($data as $key=>$value){
307	- ~~$xml .= "<".trim~~($~~key~~)~~.">\n";~~
308	- $xml .= ~~$this->array2xml~~($~~value~~);
309	- ~~$xml .= "</".trim($key).">\n";~~




310	}
311	}else if(is_bool($data)){
312	if($data){$xml = "true\n";}
	@@ -317,23 +351,82 @@ class ups {
317	return $xml;
318	}
319






























































320
321	private function _buildRateRequest($args){
322	// Vars is an array
323	// $RateRequest, $RatePackage, $RateCustomPackage, $RateRequestEnd
324	// Are defined in ups_data.php that is included below if not
325	// done so by instantiating class ... shouldnt ever need to
326	- if ~~(!isset($~~this~~->MessageStart)){~~
327	- $this->_includeUPSData();
328	- }
329	- // Always start of with this, it includes the auth block//
330	$REQUEST = "<?xml version=\"1.0\"?>\n
331	<AccessRequest xml:lang=\"en-US\">\n";
332
333	$access = array(
334	"AccessLicenseNumber"=>base64_decode($args['api_id']), // UPS API ID#
335	- "UserId" =>base64_decode($args['username']), // UPS API Username
336	- "Password" =>base64_decode($args['password']) // UPS API Password
337	);
338
339	$REQUEST .= $this->array2xml($access);
	@@ -377,10 +470,10 @@ class ups {
377	}
378
379	// Set up Shipment Node
380	- $Shipment = ~~array()~~;
381
382	// Shipper Address (billing)
383	- $~~Shipment["~~Shipper"]=array(
384	"Address"=>array(
385	"StateProvinceCode"=>$args['shipr_state'],
386	"PostalCode"=>$args['shipr_pcode'], // The shipper Postal Code
	@@ -390,18 +483,21 @@ class ups {
390	// Negotiated Rates
391	if (array_key_exists('negotiated_rates', $args) ){
392	if ($args['negotiated_rates'] == '1' && !empty($args['account_number'])){
393	- $~~Shipment["~~Shipper"]["ShipperNumber"] = $args['account_number'];
394	}
395	}
396
397	// If the city is configured use it
398	if (array_key_exists('shipr_city', $args)){
399	if (!empty($args['shipr_city'])){
400	- $~~Shipment["~~Shipper"]["Address"]["City"] = $args["shipr_city"];
401	}
402	}



403	// The physical address the shipment is from (normally the same as billing)
404	- $~~Shipment["~~ShipFrom"]=array(
405	"Address"=>array(
406	"StateProvinceCode"=>$args['shipf_state'],
407	"PostalCode"=>$args['shipf_pcode'], // The shipper Postal Code
	@@ -411,41 +507,60 @@ class ups {
411	// If the city is configured use it
412	if (array_key_exists('shipf_city', $args)){
413	if (!empty($args['shipf_city'])){
414	- $~~Shipment["~~ShipFrom"]["Address"]["City"] = $args["shipf_city"];
415	}
416	}
417
418	- $Shipment~~["ShipTo"]=~~ array(


419	"Address"=>array(
420	- "StateProvinceCode"=>$args['dest_state'], // The Destination State
421	- "PostalCode"=>$args['dest_pcode'], // The Destination Postal Code
422	- "CountryCode"=>$args['dest_ccode'], // The Destination Country

423	));
424
425	if ($args['residential'] == '1'){ //ResidentialAddressIndicator orig - Indicator
426	- $~~Shipment["~~ShipTo"]["Address"]["ResidentialAddressIndicator"] = "1";
427	}


428
429	// If there is a specific service being requested then
430	// we want to pass the service into the XML
431	if (isset($args["service"])){
432	- $Shipment["Service"~~] =~~ array("Code" =>$args['service']);
433	}
434
435	// Include this only if you want negotiated rates
436	if (array_key_exists('negotiated_rates', $args) ){
437	if ($args['negotiated_rates'] == "1"){
438	- $Shipment["RateInformation"]=array("NegotiatedRatesIndicator" => "");
439	}
440	}
441	-
442	- $~~Shipment~~["~~Package~~"] ~~= array(~~
443	- ~~"PackagingType"=>array~~(~~"Code"=>$~~args~~['packaging']~~),
444	- ~~"PackageWeight"=>array(~~
445	- "~~UnitOfMeasurement~~"=>array(~~"Code"=>$args['units']),~~
446	- "~~Weight~~" => $args[~~"weight"~~]
447	- )
448	- );














449
450	// Set the structure for the Shipment Node
451	$RatingServiceRequest["Shipment"] = $Shipment;
	@@ -458,11 +573,6 @@ class ups {
458	}
459
460	private function _makeRateRequest($message){
461	-
462	- if (!isset($this->service_url)) {
463	- $this->_setServiceURL;
464	- }
465	-
466	// Make the XML request to the server and retrieve the response
467	$ch = curl_init();
468
	@@ -502,10 +612,6 @@ class ups {
502	private function _parseQuote($raw){
503	global $wpdb;
504
505	- if (!isset($this->Services)){
506	- $this->_includeUPSData();
507	- }
508	-
509	$config = get_option('wpsc_ups_settings');
510	$debug = (array_key_exists('upsenvironment', $config)) ? $config['upsenvironment'] : "";
511
	@@ -545,6 +651,7 @@ class ups {
545	$price = "";
546	$time = "";
547

548	$getNegotiatedRateNode = $rate_block->getElementsByTagName("NegotiatedRates");
549	if ($getNegotiatedRateNode){
550	$negotiatedRateNode = $getNegotiatedRateNode->item(0);
	@@ -567,7 +674,15 @@ class ups {
567	// Get the <TotalCharges> Node from the XML chunk
568	$getChargeNodes = $rate_block->getElementsByTagName("TotalCharges");
569	$chargeNode = $getChargeNodes->item(0);
570	-








571	// Get the <CurrencyCode> from the <TotalCharge> chunk
572	$getCurrNode= $chargeNode->getElementsByTagName("CurrencyCode");
573	// Get the value of <CurrencyCode>
	@@ -584,14 +699,14 @@ class ups {
584	// are not explicitly defined.
585	if (!empty($wpsc_ups_services)){
586	if (is_array($wpsc_ups_services)){
587	- if (array_search($serviceCode, $wpsc_ups_services) === false){
588	continue;
589	}
590	}else if ($wpsc_ups_services != $serviceCode){
591	continue;
592	}
593	}
594	- if(array_key_exists($serviceCode,$this->Services)){
595	$rate_table[$this->Services[$serviceCode]] = array($currCode,$price);
596	}
597
	@@ -630,7 +745,7 @@ class ups {
630	}
631
632	function getQuote(){
633	- global $wpdb;
634
635	// Arguments array for various functions to use
636	$args = array();
	@@ -640,16 +755,17 @@ class ups {
640	$wpsc_ups_settings = get_option("wpsc_ups_settings");
641	// Get the wordpress shopping cart options
642	$wpsc_options = get_option("wpsc_options");
643	-
644	// API Auth settings //
645	$args['username'] = (array_key_exists('upsaccount',$wpsc_ups_settings)) ? $wpsc_ups_settings['upsusername'] : "";
646	$args['password'] = (array_key_exists('upspassword',$wpsc_ups_settings)) ? $wpsc_ups_settings['upspassword'] : "";
647	$args['api_id'] = (array_key_exists('upsid',$wpsc_ups_settings)) ? $wpsc_ups_settings['upsid'] : "";
648	$args['account_number'] = (array_key_exists('upsaccount',$wpsc_ups_settings)) ? $wpsc_ups_settings['upsaccount'] : "";
649	- $args['negotiated_rates'] = (array_key_exists('ups_negotiated_rates',$wpsc_ups_settings)) ?
650	$wpsc_ups_settings['ups_negotiated_rates'] : "";
651	$args['residential'] = $wpsc_ups_settings['49_residential'];
652	-

653	// What kind of pickup service do you use ?
654	$args['DropoffType'] = $wpsc_ups_settings['DropoffType'];
655	$args['packaging'] = $wpsc_ups_settings['48_container'];
	@@ -684,7 +800,7 @@ class ups {
684	// So, UPS is a little off the times
685	$args['dest_ccode'] = "GB";
686	}
687	-
688	// If ths zip code is provided via a form post use it!
689	if(isset($_POST['zipcode']) && ($_POST['zipcode'] != "Your Zipcode" && $_POST['zipcode'] != "YOURZIPCODE")) {
690	$args['dest_pcode'] = $_POST['zipcode'];
	@@ -701,7 +817,7 @@ class ups {
701	if(isset($_POST['region']) && !empty($_POST['region'])) {
702	$query ="SELECT `".WPSC_TABLE_REGION_TAX."`.* FROM `".WPSC_TABLE_REGION_TAX."`
703	WHERE `".WPSC_TABLE_REGION_TAX."`.`id` = '".$_POST['region']."'";
704	- $dest_region_data = $wpdb->get_results($query, ARRAY_A);
705	$args['dest_state'] = (is_array($dest_region_data)) ? $dest_region_data[0]['code'] : "";
706	$_SESSION['wpsc_state'] = $args['dest_state'];
707	} else if(isset($_SESSION['wpsc_state'])) {
	@@ -714,17 +830,17 @@ class ups {
714	$shipping_cache_check['state'] = $args['dest_state'];
715	$shipping_cache_check['zipcode'] = $args['dest_pcode'];
716	$shipping_cache_check['weight'] = $args['weight'];
717	-
718	- // This is where shipping breaks out of UPS if weight is higher than 150 LBS
719	- if($weight > 150){
720	- unset($_SESSION['quote_shipping_method']);
721	- $shipping_quotes[TXT_WPSC_OVER_UPS_WEIGHT] = 0;
722	- $_SESSION['wpsc_shipping_cache_check']['weight'] = $args['weight'];
723	- $_SESSION['wpsc_shipping_cache'][$this->internal_name] = $shipping_quotes;
724	- $_SESSION['quote_shipping_method'] = $this->internal_name;
725	- return array($shipping_quotes);

726	}
727	-
728	// We do not want to spam UPS (and slow down our process) if we already
729	// have a shipping quote!
730	if(($_SESSION['wpsc_shipping_cache_check'] === $shipping_cache_check)
	@@ -733,6 +849,8 @@ class ups {
733	$rate_table = $_SESSION['wpsc_shipping_cache'][$this->internal_name];
734	return $rate_table;
735	}else{


736	// Build the XML request
737	$request = $this->_buildRateRequest($args);
738	// Now that we have the message to send ... Send it!
	@@ -744,10 +862,13 @@ class ups {
744	if ($quotes != false){
745	$rate_table = $this->_formatTable($quotes,$args['currency']);
746	}else{
747	- if ($wpsc_ups_settings['upsenvironment'] == '1' ~~&& 'true' == WP_DEBUG~~){
748	echo "<strong>:: GetQuote ::DEBUG OUTPUT::</strong><br />";
749	echo "Arguments sent to UPS";
750	print_r($args);



751	echo "Response from UPS";
752	echo $raw_quote;
753	echo "</strong>:: GetQuote ::End DEBUG OUTPUT::";
	@@ -755,10 +876,10 @@ class ups {
755	}
756	}
757
758	- $~~_SESSION['wpsc_shipping_cache_check']['state'] =~~ $~~args['dest_state'];~~
759	- $~~_SESSION~~[~~'wpsc_shipping_cache_check'~~]~~['zipcode']~~ = $args[~~'dest_pcode'~~];
760	- $~~_SESSION~~[~~'wpsc_shipping_cache_check'~~]~~['weight']~~ = $~~args['weight']~~;
761	- ~~$_SESSION['wpsc_shipping_cache'][$this->internal_name] = $rate_table;~~
762	// return the final formatted array !
763	return $rate_table;
764	}
	@@ -767,6 +888,5 @@ class ups {
767	function get_item_shipping(){
768	}
769	}
770	- $~~ups~~ = new ~~ups~~();
771	- $wpsc_shipping_modules[$~~ups~~->getInternalName()] = $~~ups~~;
772	- ?>


1	<?php
2	+ /* Author : Greg Gullett and Instinct.co.uk
3	+ * SVN : UPS Trunk :
4	+ * Version : 1.1.0 : December 21, 2010
5	*/
6	+ class ash_ups {
7	var $internal_name, $name;
8	+ var $service_url = "";
9	+ var $Services = "";
10	+ var $singular_shipping = FALSE;
11	+ var $shipment;
12	+
13	+ function ash_ups() {
14	+ global $wpec_ash;
15	+ $this->internal_name = "ups";
16	+ $this->name="UPS";
17	+ $this->is_external=true;
18	+ $this->requires_curl=true;
19	+ $this->requires_weight=true;
20	+ $this->needs_zipcode=true;
21	+ $this->_setServiceURL();
22	+ $this->_includeUPSData();
23	+ $this->shipment = $wpec_ash->get_shipment();
24	+ return true;
25	+ }
26
27	+ function getId() {
28	+ // return $this->usps_id;
29	+ }
30
31	+ function setId($id) {
32	+ // $usps_id = $id;
33	+ // return true;
34	}
35
36	private function _setServiceURL(){
37	global $wpdb;
38	$wpsc_ups_settings = get_option("wpsc_ups_settings");
39	+ $wpsc_ups_environment = (array_key_exists("upsenvironment",(array)$wpsc_ups_settings)) ? $wpsc_ups_settings["upsenvironment"] : "1";


40	if ($wpsc_ups_environment == "1"){
41	$this->service_url = "https://wwwcie.ups.com/ups.app/xml/Rate";
42	}else{

67	"01" => "Daily Pickup, with UPS Account",
68	"03" => "No Daily Pickup, with No or Other Account",
69	"04" => "Retail Outlet (Only US origin shipments)"
70	+ );
71
72	$this->Services = array(
73	"14" => "Next Day Air Early AM",

91	}
92
93	function getForm(){
94	+ if (!isset($this->Services)){

95	$this->_includeUPSData();
96	}



97
98	//__('Your Packaging', 'wpsc'); <-- use to translate
99	$wpsc_ups_settings = get_option("wpsc_ups_settings");

147	$sel2_drop = "01";
148	}else{ $sel2_drop = $wpsc_ups_settings['DropoffType']; }
149
150	+ foreach(array_keys((array)$this->drop_types) as $dkey){
151	$sel = "";
152	if ($sel2_drop == $dkey){
153	$sel = 'selected="selected"';

199	$output .= "</tr>\n\r";
200
201	$selected_env = $wpsc_ups_settings['upsenvironment'];
202	+ if ($selected_env == "1"){
203	$env_test = "checked=\"checked\"";
204	+ }

205	$output .= ("
206	<tr>
207	<td><label for=\"ups_env_test\" >".__('Use Testing Environment', 'wpsc')."</label></td>

223	</td>
224	</tr>
225	");
226	+ $insured_shipment = "";
227	+ if ($wpsc_ups_settings['insured_shipment'] == "1"){
228	+ $insured_shipment = "checked=\"checked\"";
229	+ }
230	+ $output .= ("
231	+ <tr>
232	+ <td><label for=\"ups_insured_shipment\" >".__('Insure shipment against cart total', 'wpsc')." *</label></td>
233	+ <td>
234	+ <input type=\"checkbox\" id=\"ups_insured_shipment\" name=\"wpsc_ups_settings[insured_shipment]\" value=\"1\" ".$insured_shipment." /><br />
235	+ </td>
236	+ </tr>
237	+ ");
238	+ $singular_shipping = "";
239	+ if ($wpsc_ups_settings['singular_shipping'] == "1"){
240	+ $singular_shipping = "checked=\"checked\"";
241	+ }
242	+ $output .= ("
243	+ <tr>
244	+ <td><label for=\"ups_singular_shipping\" >".__('Singular Shipping', 'wpsc')." *</label></td>
245	+ <td>
246	+ <input type=\"checkbox\" id=\"ups_singular_shipping\" name=\"wpsc_ups_settings[singular_shipping]\" value=\"1\" ".$singular_shipping." /><br />
247	+ ".__('Rate each quantity of items in a cart as its own package using dimensions on product')."
248	+ </td>
249	+ </tr>
250	+ ");
251	$output .= ("
252	<tr>
253	<td>

314	/* This function is called when the user hit "submit" in the
315	* UPS settings area under Shipping to update the setttings.
316	*/
317	+ if (isset( $_POST['wpsc_ups_settings'] ) && !empty( $_POST['wpsc_ups_settings'] ) ) {
318	$wpsc_ups_services = $_POST['wpsc_ups_services'];
319	update_option('wpsc_ups_services',$wpsc_ups_services);
320	$temp = $_POST['wpsc_ups_settings'];

334	$xml = "";
335	if (is_array($data)){
336	foreach($data as $key=>$value){
337	+ //if(empty($value)){
338	+ // $xml .= "<".trim($key)." />\n";
339	+ //}else{
340	+ $xml .= "<".trim($key).">\n";
341	+ $xml .= $this->array2xml($value);
342	+ $xml .= "</".trim($key).">\n";
343	+ // }
344	}
345	}else if(is_bool($data)){
346	if($data){$xml = "true\n";}

351	return $xml;
352	}
353
354	+ private function _is_large(&$pack ,$package){
355	+ $maximum = 165; // in inches
356	+ $large_floor = 130; // in inches
357	+ $calc_total = ((2 * $package->width)+(2 * $package->height));
358	+ if ($calc_total >= $maximum){
359	+ throw new Exception("Package dimensions exceed non-freight limits");
360	+ }elseif($calc_total > $large_floor){
361	+ $pack["LargePackageIndicator"] = "";
362	+ }
363	+ }
364	+
365	+ private function _insured_value(&$pack, $package, $args){
366	+ $monetary_value = $package->value;
367	+ if ($package->insurance === TRUE){
368	+ if ($package->insured_amount){
369	+ $monetary_value = $package->insured_amount;
370	+ }
371	+ $pack["PackageServiceOptions"]["InsuredValue"] = array(
372	+ "CurrencyCode" => $args["currency"],
373	+ "MonetaryValue" => $package->insured_amount
374	+ );
375	+ }
376	+
377	+ }
378	+
379	+ private function _declared_value(&$pack, $package, $args){
380	+ $pack["PackageServiceOptions"]["DeclaredValue"] = array(
381	+ "CurrencyCode" => $args["currency"],
382	+ "MonetaryValue" => $args["cart_total"]
383	+ );
384	+ }
385	+
386	+ private function _build_shipment(&$Shipment, $args){
387	+ $cart_shipment = $this->shipment;
388	+
389	+ foreach($cart_shipment->packages as $package){
390	+ $pack = array(
391	+ "PackagingType" => array(
392	+ "Code"=>"02"
393	+ ),
394	+ "Dimensions" => array(
395	+ "UnitOfMeasurement" => array(
396	+ "Code" => "IN"
397	+ ),
398	+ "Length" => $package->length,
399	+ "Width" => $package->width,
400	+ "Height" => $package->height
401	+ ),
402	+ "PackageWeight"=>array(
403	+ "UnitOfMeasurement"=>array(
404	+ "Code" => "LBS"
405	+ ),
406	+ "Weight" => $package->weight
407	+ )
408	+ ); // End Package
409	+ // handle if the package is "large" or not (UPS standard)
410	+ $this->_is_large($pack, $package);
411	+ $this->_insured_value($pack, $package, $args);
412	+ $this->_declared_value($pack, $package, $args);
413	+ $Shipment .= $this->array2xml(array("Package"=>$pack));
414	+ } // End for each package in shipment
415	+ }
416
417	private function _buildRateRequest($args){
418	// Vars is an array
419	// $RateRequest, $RatePackage, $RateCustomPackage, $RateRequestEnd
420	// Are defined in ups_data.php that is included below if not
421	// done so by instantiating class ... shouldnt ever need to
422	+ // Always start of with this, it includes the auth block



423	$REQUEST = "<?xml version=\"1.0\"?>\n
424	<AccessRequest xml:lang=\"en-US\">\n";
425
426	$access = array(
427	"AccessLicenseNumber"=>base64_decode($args['api_id']), // UPS API ID#
428	+ "UserId" =>base64_decode($args['username']), // UPS API Username
429	+ "Password" =>base64_decode($args['password']) // UPS API Password
430	);
431
432	$REQUEST .= $this->array2xml($access);

470	}
471
472	// Set up Shipment Node
473	+ $Shipment = "";
474
475	// Shipper Address (billing)
476	+ $Shipper = array(
477	"Address"=>array(
478	"StateProvinceCode"=>$args['shipr_state'],
479	"PostalCode"=>$args['shipr_pcode'], // The shipper Postal Code

483	// Negotiated Rates
484	if (array_key_exists('negotiated_rates', $args) ){
485	if ($args['negotiated_rates'] == '1' && !empty($args['account_number'])){
486	+ $Shipper["ShipperNumber"] = $args['account_number'];
487	}
488	}
489
490	// If the city is configured use it
491	if (array_key_exists('shipr_city', $args)){
492	if (!empty($args['shipr_city'])){
493	+ $Shipper["Address"]["City"] = $args["shipr_city"];
494	}
495	}
496	+
497	+ $Shipment .= $this->array2xml(array("Shipper"=>$Shipper));
498	+
499	// The physical address the shipment is from (normally the same as billing)
500	+ $ShipFrom=array(
501	"Address"=>array(
502	"StateProvinceCode"=>$args['shipf_state'],
503	"PostalCode"=>$args['shipf_pcode'], // The shipper Postal Code

507	// If the city is configured use it
508	if (array_key_exists('shipf_city', $args)){
509	if (!empty($args['shipf_city'])){
510	+ $ShipFrom["Address"]["City"] = $args["shipf_city"];
511	}
512	}
513
514	+ $Shipment .= $this->array2xml(array("ShipFrom"=>$ShipFrom));
515	+
516	+ $ShipTo= array(
517	"Address"=>array(
518	+ "StateProvinceCode"=>$args['dest_state'], // The Destination State
519	+ "PostalCode"=>$args['dest_pcode'], // The Destination Postal Code
520	+ "CountryCode"=>$args['dest_ccode'], // The Destination Country
521	+ //"ResidentialAddress"=>"1"
522	));
523
524	if ($args['residential'] == '1'){ //ResidentialAddressIndicator orig - Indicator
525	+ $ShipTo["Address"]["ResidentialAddressIndicator"] = "1";
526	}
527	+
528	+ $Shipment .= $this->array2xml(array("ShipTo"=>$ShipTo));
529
530	// If there is a specific service being requested then
531	// we want to pass the service into the XML
532	if (isset($args["service"])){
533	+ $Shipment .= array("Service"=>array("Code" =>$args['service']));
534	}
535
536	// Include this only if you want negotiated rates
537	if (array_key_exists('negotiated_rates', $args) ){
538	if ($args['negotiated_rates'] == "1"){
539	+ $Shipment .=array("RateInformation"=>array("NegotiatedRatesIndicator" => ""));
540	}
541	}
542	+
543	+ if ((boolean)$args["singular_shipping"]){
544	+ $this->_build_shipment($Shipment,$args);
545	+ }else{
546	+ $package = array("Package"=> array(
547	+ "PackagingType"=>array("Code"=>$args['packaging']),
548	+ "PackageWeight"=>array(
549	+ "UnitOfMeasurement"=>array("Code"=>$args['units']),
550	+ "Weight" => $args["weight"]
551	+ )
552	+ ));
553	+ if ((boolean)$args["insured_shipment"]){
554	+ $package["PackageServiceOptions"] = array(
555	+ "InsuredValue"=> array(
556	+ "CurrencyCode"=>$args["currency"],
557	+ "MonetaryValue"=>$args["cart_total"]
558	+ )
559	+ );
560	+ }
561	+
562	+ $Shipment .= $this->array2xml($package);
563	+ }
564
565	// Set the structure for the Shipment Node
566	$RatingServiceRequest["Shipment"] = $Shipment;

573	}
574
575	private function _makeRateRequest($message){





576	// Make the XML request to the server and retrieve the response
577	$ch = curl_init();
578

612	private function _parseQuote($raw){
613	global $wpdb;
614




615	$config = get_option('wpsc_ups_settings');
616	$debug = (array_key_exists('upsenvironment', $config)) ? $config['upsenvironment'] : "";
617

651	$price = "";
652	$time = "";
653
654	+ //if (array_key_exists('ups_negotiated_rates', $config)){
655	$getNegotiatedRateNode = $rate_block->getElementsByTagName("NegotiatedRates");
656	if ($getNegotiatedRateNode){
657	$negotiatedRateNode = $getNegotiatedRateNode->item(0);

674	// Get the <TotalCharges> Node from the XML chunk
675	$getChargeNodes = $rate_block->getElementsByTagName("TotalCharges");
676	$chargeNode = $getChargeNodes->item(0);
677	+ /*
678	+ $getDeliveryNode = $rate_block->getElementsByTagName("GuaranteedDaysToDelivery");
679	+ $deliveryDays = $getDeliveryNode->item(0)->nodeValue;
680	+ if ($deliveryDays){
681	+ $time = $this->futureDate($deliveryDays);
682	+ }else{
683	+ $time = $this->futureDate(6);
684	+ }
685	+ */
686	// Get the <CurrencyCode> from the <TotalCharge> chunk
687	$getCurrNode= $chargeNode->getElementsByTagName("CurrencyCode");
688	// Get the value of <CurrencyCode>

699	// are not explicitly defined.
700	if (!empty($wpsc_ups_services)){
701	if (is_array($wpsc_ups_services)){
702	+ if (array_search($serviceCode, (array)$wpsc_ups_services) === false){
703	continue;
704	}
705	}else if ($wpsc_ups_services != $serviceCode){
706	continue;
707	}
708	}
709	+ if(array_key_exists($serviceCode,(array)$this->Services)){
710	$rate_table[$this->Services[$serviceCode]] = array($currCode,$price);
711	}
712

745	}
746
747	function getQuote(){
748	+ global $wpdb, $wpec_ash;
749
750	// Arguments array for various functions to use
751	$args = array();

755	$wpsc_ups_settings = get_option("wpsc_ups_settings");
756	// Get the wordpress shopping cart options
757	$wpsc_options = get_option("wpsc_options");
758	+
759	// API Auth settings //
760	$args['username'] = (array_key_exists('upsaccount',$wpsc_ups_settings)) ? $wpsc_ups_settings['upsusername'] : "";
761	$args['password'] = (array_key_exists('upspassword',$wpsc_ups_settings)) ? $wpsc_ups_settings['upspassword'] : "";
762	$args['api_id'] = (array_key_exists('upsid',$wpsc_ups_settings)) ? $wpsc_ups_settings['upsid'] : "";
763	$args['account_number'] = (array_key_exists('upsaccount',$wpsc_ups_settings)) ? $wpsc_ups_settings['upsaccount'] : "";
764	+ $args['negotiated_rates'] = (array_key_exists('ups_negotiated_rates',$wpsc_ups_settings)) ?
765	$wpsc_ups_settings['ups_negotiated_rates'] : "";
766	$args['residential'] = $wpsc_ups_settings['49_residential'];
767	+ $args["singular_shipping"] = (array_key_exists("singular_shipping", $wpsc_ups_settings)) ? $wpsc_ups_settings["singular_shipping"] : "0";
768	+ $args['insured_shipment'] = (array_key_exists("insured_shipment", $wpsc_ups_settings)) ? $wpsc_ups_settings["insured_shipment"] : "0";
769	// What kind of pickup service do you use ?
770	$args['DropoffType'] = $wpsc_ups_settings['DropoffType'];
771	$args['packaging'] = $wpsc_ups_settings['48_container'];

800	// So, UPS is a little off the times
801	$args['dest_ccode'] = "GB";
802	}
803	+
804	// If ths zip code is provided via a form post use it!
805	if(isset($_POST['zipcode']) && ($_POST['zipcode'] != "Your Zipcode" && $_POST['zipcode'] != "YOURZIPCODE")) {
806	$args['dest_pcode'] = $_POST['zipcode'];

817	if(isset($_POST['region']) && !empty($_POST['region'])) {
818	$query ="SELECT `".WPSC_TABLE_REGION_TAX."`.* FROM `".WPSC_TABLE_REGION_TAX."`
819	WHERE `".WPSC_TABLE_REGION_TAX."`.`id` = '".$_POST['region']."'";
820	+ $dest_region_data = $wpdb->get_results($query, ARRAY_A);
821	$args['dest_state'] = (is_array($dest_region_data)) ? $dest_region_data[0]['code'] : "";
822	$_SESSION['wpsc_state'] = $args['dest_state'];
823	} else if(isset($_SESSION['wpsc_state'])) {

830	$shipping_cache_check['state'] = $args['dest_state'];
831	$shipping_cache_check['zipcode'] = $args['dest_pcode'];
832	$shipping_cache_check['weight'] = $args['weight'];
833	+ if (!(boolean)$args["singular_shipping"]){
834	+ // This is where shipping breaks out of UPS if weight is higher than 150 LBS
835	+ if($weight > 150){
836	+ unset($_SESSION['quote_shipping_method']);
837	+ $shipping_quotes[TXT_WPSC_OVER_UPS_WEIGHT] = 0;
838	+ $_SESSION['wpsc_shipping_cache_check']['weight'] = $args['weight'];
839	+ $_SESSION['wpsc_shipping_cache'][$this->internal_name] = $shipping_quotes;
840	+ $_SESSION['quote_shipping_method'] = $this->internal_name;
841	+ return array($shipping_quotes);
842	+ }
843	}

844	// We do not want to spam UPS (and slow down our process) if we already
845	// have a shipping quote!
846	if(($_SESSION['wpsc_shipping_cache_check'] === $shipping_cache_check)

849	$rate_table = $_SESSION['wpsc_shipping_cache'][$this->internal_name];
850	return $rate_table;
851	}else{
852	+ global $wpsc_cart;
853	+ $args["cart_total"] = $wpsc_cart->calculate_subtotal(true);
854	// Build the XML request
855	$request = $this->_buildRateRequest($args);
856	// Now that we have the message to send ... Send it!

862	if ($quotes != false){
863	$rate_table = $this->_formatTable($quotes,$args['currency']);
864	}else{
865	+ if ($wpsc_ups_settings['upsenvironment'] == '1'){
866	echo "<strong>:: GetQuote ::DEBUG OUTPUT::</strong><br />";
867	echo "Arguments sent to UPS";
868	print_r($args);
869	+ echo "<hr />";
870	+ print $request;
871	+ echo "<hr />";
872	echo "Response from UPS";
873	echo $raw_quote;
874	echo "</strong>:: GetQuote ::End DEBUG OUTPUT::";

876	}
877	}
878
879	+ $wpec_ash->cache_results($this->internal_name,
880	+ $args["dest_ccode"], $args["dest_state"],
881	+ $args["dest_pcode"], $rate_table, $this->shipment);
882	+
883	// return the final formatted array !
884	return $rate_table;
885	}

888	function get_item_shipping(){
889	}
890	}
891	+ $ash_ups = new ash_ups();
892	+ $wpsc_shipping_modules[$ash_ups->getInternalName()] = $ash_ups;

wpsc-shipping/usps.php DELETED Viewed

@@ -1,449 +0,0 @@
-            -
            <?php
-            -
            class usps {
-            -
                var $usps_id, $usps_password, $internal_name, $name;
-            -
                function usps () {
-            -
                    $this->internal_name = "usps";
-            -
                    $this->name="USPS";
-            -
                    $this->is_external=true;
-            -
                    $this->requires_curl=true;
-            -
                    $this->needs_zipcode=true;
-            -
                    return true;
-            -
                }
-            -
-            -
                function getId() {
-            -
                    return $this->usps_id;
-            -
                }
-            -
-            -
                function setId($id) {
-            -
                    $usps_id = $id;
-            -
                    return true;
-            -
                }
-            -
-            -
                function getName() {
-            -
                    return $this->name;
-            -
                }
-            -
-            -
                function getInternalName() {
-            -
                    return $this->internal_name;
-            -
                }
-            -
-            -
                function getForm() {
-            -
                    $checked = '';
-            -
                    if(get_option("usps_test_server") == '1') {
-            -
                        $checked = 'checked = "checked"';
-            -
                    }
-            -
-            -
                    $allServices['FIRST CLASS'] = '';
-            -
                    $allServices['PRIORITY'] = '';
-            -
                    $allServices['PRIORITY_MAIL'] = '';
-            -
                    $allServices['PRIORITY_SMALL'] = '';
-            -
                    $allServices['PRIORITY_REGULAR'] = '';
-            -
                    $allServices['PRIORITY_LARGE'] = '';
-            -
                    $allServices['EXPRESS'] = '';
-            -
                    $allServices['EXPRESS_REGULAR'] = '';
-            -
                    $allServices['PARCEL POST'] = '';
-            -
                    $allServices['MEDIA'] = '';
-            -
                    $allServices['LIBRARY'] = '';
-            -
-            -
                    $selectedServices = explode(", ", get_option('usps_services'));
-            -
-            -
                    foreach($selectedServices as $key){
-            -
                        $allServices[$key] = 'checked = "checked"';
-            -
                    }
-            -
-            -
                    $output="<tr>
-            -
            					<td>
-            -
            						".__('USPS ID', 'wpsc').":
-            -
            					</td>
-            -
            					<td>
-            -
            						<input type='text' name='uspsid' value='".get_option("uspsid")."' />
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td>
-            -
            						".__('USPS Password', 'wpsc').":
-            -
            					</td>
-            -
            					<td>
-            -
            						<input type='text' name='uspspw' value='".get_option("uspspw")."' />
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td>
-            -
            						".__('Use Test Server:','wpsc')."
-            -
            					</td>
-            -
            					<td>
-            -
            						<input type='checkbox' ".$checked." name='usps_test_server' value='1' />
-            -
            					</td>
-            -
            				</tr>
-            -
                                            <tr>
-            -
            					<td>
-            -
            						".__('Select services:','wpsc')."
-            -
            					</td>
-            -
            					<td>
-            -
            						<input type='checkbox' ".$allServices['FIRST CLASS']." name='usps_services[]' value='FIRST CLASS' /> First-Class Mail<br />
-            -
                                                            <input type='checkbox' ".$allServices['PRIORITY']." name='usps_services[]' value='PRIORITY' /> Priority Mail Flat Rate Envelope<br />
-            -
                                                            <input type='checkbox' ".$allServices['PRIORITY_MAIL']." name='usps_services[]' value='PRIORITY_MAIL' /> Priority Mail<br />
-            -
                                                            <input type='checkbox' ".$allServices['PRIORITY_SMALL']." name='usps_services[]' value='PRIORITY_SMALL' /> Priority Mail Small Flat Rate Box<br />
-            -
                                                            <input type='checkbox' ".$allServices['PRIORITY_REGULAR']." name='usps_services[]' value='PRIORITY_REGULAR' /> Priority Mail Medium Flat Rate Box<br />
-            -
                                                            <input type='checkbox' ".$allServices['PRIORITY_LARGE']." name='usps_services[]' value='PRIORITY_LARGE' /> Priority Mail Large Flat Rate Box<br />
-            -
                                                            <input type='checkbox' ".$allServices['EXPRESS']." name='usps_services[]' value='EXPRESS' /> Express Mail Flat Rate Envelope<br />
-            -
                                                            <input type='checkbox' ".$allServices['EXPRESS_REGULAR']." name='usps_services[]' value='EXPRESS_REGULAR' /> Express Mail<br />
-            -
                                                            <input type='checkbox' ".$allServices['PARCEL POST']." name='usps_services[]' value='PARCEL POST' /> Parcel Post<br />
-            -
                                                            <input type='checkbox' ".$allServices['MEDIA']." name='usps_services[]' value='MEDIA' /> Media Mail<br />
-            -
                                                            <input type='checkbox' ".$allServices['LIBRARY']." name='usps_services[]' value='LIBRARY' /> Library Mail<br />
-            -
            					</td>
-            -
            				</tr>
-            -
                                            <tr>
-            -
            					<td>
-            -
            						".__('Add amount to rates:','wpsc')."
-            -
            					</td>
-            -
            					<td>
-            -
            						<input type='text' name='usps_extra_cost' value='".get_option("usps_extra_cost")."' />
-            -
            					</td>
-            -
            				</tr>
-            -
-            -
            				";
-            -
                    return $output;
-            -
                }
-            -
-            -
                function submit_form() {
-            -
                    if (isset($_POST['uspsid']) && $_POST['uspsid'] != '') {
-            -
                        update_option('uspsid', $_POST['uspsid']);
-            -
                    }
-            -
                    if (isset($_POST['uspspw']) && $_POST['uspspw'] != '') {
-            -
                        update_option('uspspw', $_POST['uspspw']);
-            -
                    }
-            -
                    if (isset($_POST['usps_extra_cost']) && $_POST['usps_extra_cost'] != '') {
-            -
                        update_option('usps_extra_cost', $_POST['usps_extra_cost']);
-            -
                    }
-            -
                    if(isset($_POST['usps_test_server']) && $_POST['usps_test_server'] != '') {
-            -
                        update_option('usps_test_server', $_POST['usps_test_server']);
-            -
                    }else {
-            -
                        update_option('usps_test_server', '');
-            -
                    }
-            -
                    if(isset($_POST['usps_services']) && $_POST['usps_services'] != ''){
-            -
                        $services = '';
-            -
                        foreach($_POST['usps_services'] as $key){
-            -
                            $services .= $key.', ';
-            -
                        }
-            -
                        $services = substr($services, 0, -2);
-            -
                        update_option('usps_services', $services);
-            -
                    }
-            -
                    return true;
-            -
                }
-            -
-            -
                function getQuote() {
-            -
                    global $wpdb, $wpsc_usps_quote;
-            -
                    if(isset($wpsc_usps_quote) && (count($wpsc_usps_quote)> 0)) {
-            -
                        return $wpsc_usps_quote;
-            -
                    }
-            -
                    if(isset($_POST['zipcode'])) {
-            -
-            -
                        $zipcode = $_POST['zipcode'];
-            -
                        $_SESSION['wpsc_zipcode'] = $_POST['zipcode'];
-            -
                    } else if(isset($_SESSION['wpsc_zipcode'])) {
-            -
                        $zipcode = $_SESSION['wpsc_zipcode'];
-            -
                    }else {
-            -
                        $zipcode = get_option('base_zipcode');
-            -
                    }
-            -
                    $dest = $_SESSION['wpsc_delivery_country'];
-            -
                    $weight = wpsc_cart_weight_total();
-            -
                    $pound = floor($weight);
-            -
                    $ounce = ($weight-$pound)*16;
-            -
                    $machinable = 'true';
-            -
                    if (($ounce > 13) || ($pound > 1)) {
-            -
                        $serv = get_option('usps_services');
-            -
                        $serv = str_replace('FIRST CLASS, ', '', $serv);
-            -
                        $serv = str_replace('FIRST CLASS', '', $serv);
-            -
                        define('MODULE_SHIPPING_USPS_TYPES', $serv);
-            -
                    } else {
-            -
                        define('MODULE_SHIPPING_USPS_TYPES', get_option('usps_services'));
-            -
                    }
-            -
-            -
                    if (($dest =='US') && ('US'== get_option('base_country'))) {
-            -
                        $request  = '<RateV3Request USERID="' . get_option('uspsid') . '" PASSWORD="' . get_option('uspspw') . '">';
-            -
                        $allowed_types = explode(", ", MODULE_SHIPPING_USPS_TYPES);
-            -
                        $types = array("FIRST CLASS" => 0,
-            -
                                "PRIORITY" => 0,
-            -
                                "PRIORITY_MAIL" => 0,
-            -
                                "PRIORITY_SMALL" => 0,
-            -
                                "PRIORITY_REGULAR" => 0,
-            -
                                "PRIORITY_LARGE" => 0,
-            -
                                "EXPRESS" => 0,
-            -
                                "EXPRESS_REGULAR" => 0,
-            -
                                "PARCEL POST" => 0,
-            -
                                "MEDIA" => 0,
-            -
                                "LIBRARY" => 0
-            -
                        );
-            -
                        while (list($key, $value) = each($types)) {
-            -
                            if ( !in_array($key, $allowed_types) ) continue;
-            -
-            -
                            // FIRST CLASS
-            -
                            if ($key == 'FIRST CLASS') {
-            -
                                if($ounce > 3.5) {
-            -
                                    $FirstClassMailType = '<FirstClassMailType>FLAT</FirstClassMailType>';
-            -
                                }
-            -
                                else {
-            -
                                    $FirstClassMailType = '<FirstClassMailType>LETTER</FirstClassMailType>';
-            -
                                }
-            -
                            } else {
-            -
                                $FirstClassMailType = '';
-            -
                            }
-            -
-            -
                            //PRIORITY
-            -
                            if ($key == 'PRIORITY') {
-            -
                                $container = 'FLAT RATE ENVELOPE';
-            -
                            }
-            -
-            -
                            if ($key == 'PRIORITY_LARGE') {
-            -
                                $key = 'PRIORITY';
-            -
                                $container = 'LG FLAT RATE BOX';
-            -
                            }
-            -
                            if ($key == 'PRIORITY_SMALL') {
-            -
                                $key = 'PRIORITY';
-            -
                                $container = 'SM FLAT RATE BOX';
-            -
                            }
-            -
                            if ($key == 'PRIORITY_REGULAR') {
-            -
                                $key = 'PRIORITY';
-            -
                                $container = 'MD FLAT RATE BOX';
-            -
                            }
-            -
                            if($key == 'PRIORITY_MAIL') {
-            -
                                $key = 'PRIORITY';
-            -
                                $container = '';
-            -
                                $size = 'REGULAR';
-            -
                            }
-            -
-            -
                            // EXPRESS
-            -
                            if ($key == 'EXPRESS') {
-            -
                                $container = 'FLAT RATE ENVELOPE';
-            -
                            }
-            -
-            -
                            if ($key == 'EXPRESS_REGULAR') {
-            -
                                $key = 'EXPRESS';
-            -
                                $container = '';
-            -
                                $size = 'REGULAR';
-            -
                            }
-            -
-            -
                            if ($key == 'PARCEL POST') {
-            -
                                $container = 'REGULAR';
-            -
                                $machinable = 'false';
-            -
                                $size =  'REGULAR';
-            -
                            }
-            -
-            -
                            if($key == 'MEDIA') {
-            -
                                $size = 'REGULAR';
-            -
                            }
-            -
-            -
                            if($key == 'LIBRARY') {
-            -
                                $size = 'REGULAR';
-            -
                            }
-            -
-            -
                            $pound = round($pound,2);
-            -
                            $ounce = round($ounce,2);
-            -
                            $request .= '<Package ID="1">' .
-            -
                                    '<Service>' . $key . '</Service>' .
-            -
                                    $FirstClassMailType .
-            -
                                    '<ZipOrigination>' . get_option("base_zipcode") . '</ZipOrigination>' .
-            -
                                    '<ZipDestination>' . $zipcode . '</ZipDestination>' .
-            -
                                    '<Pounds>' . $pound . '</Pounds>' .
-            -
                                    '<Ounces>' . $ounce . '</Ounces>' .
-            -
                                    '<Container>' . $container . '</Container>' .
-            -
                                    '<Size>' . $size . '</Size>' .
-            -
                                    '<Machinable>' . $machinable . '</Machinable>' .
-            -
                                    '</Package>';
-            -
-            -
                            if ($transit) {
-            -
                                $transitreq  = 'USERID="' . MODULE_SHIPPING_USPS_USERID .
-            -
                                        '" PASSWORD="' . MODULE_SHIPPING_USPS_PASSWORD . '">' .
-            -
                                        '<OriginZip>' . STORE_ORIGIN_ZIP . '</OriginZip>' .
-            -
                                        '<DestinationZip>' . $dest_zip . '</DestinationZip>';
-            -
-            -
                                switch ($key) {
-            -
                                    case 'EXPRESS':  $transreq[$key] = 'API=ExpressMail&XML=' .
-            -
                                                urlencode( '<ExpressMailRequest ' . $transitreq . '</ExpressMailRequest>');
-            -
                                        break;
-            -
                                    case 'PRIORITY': $transreq[$key] = 'API=PriorityMail&XML=' .
-            -
                                                urlencode( '<PriorityMailRequest ' . $transitreq . '</PriorityMailRequest>');
-            -
                                        break;
-            -
                                    case 'PARCEL':   $transreq[$key] = 'API=StandardB&XML=' .
-            -
                                                urlencode( '<StandardBRequest ' . $transitreq . '</StandardBRequest>');
-            -
                                        break;
-            -
                                    default: $transreq[$key] = '';
-            -
                                        break;
-            -
                                }
-            -
                            }
-            -
                            $services_count++;
-            -
                        }
-            -
                        $request .= '</RateV3Request>'; //'</RateRequest>'; //Changed by Greg Deeth April 30, 2008
-            -
                        $request = 'API=RateV3&XML=' . urlencode($request);
-            -
                    } else {
-            -
                        $dest=$wpdb->get_var("SELECT country FROM ".WPSC_TABLE_CURRENCY_LIST." WHERE isocode='".$dest."'");
-            -
                        if($dest == 'U.K.') {
-            -
                            $dest = 'Great Britain and Northern Ireland';
-            -
                        }
-            -
-            -
                        $pound = round($pound,2);
-            -
                        $ounce = round($ounce,2);
-            -
                        $request  = '<IntlRateRequest USERID="' . get_option('uspsid') . '" PASSWORD="' . get_option('uspspw') . '">' .
-            -
                                '<Package ID="0">' .
-            -
                                '<Pounds>' . $pound . '</Pounds>' .
-            -
                                '<Ounces>' . $ounce . '</Ounces>' .
-            -
                                '<MailType>Package</MailType>' .
-            -
                                '<Country>' . $dest . '</Country>' .
-            -
                                '</Package>' .
-            -
                                '</IntlRateRequest>';
-            -
                        $request = 'API=IntlRate&XML=' . urlencode($request);
-            -
                    }
-            -
                    $usps_server = 'production.shippingapis.com';
-            -
                    $api_dll = 'shippingAPI.dll';
-            -
                    if(get_option('usps_test_server') == '1') {
-            -
                        $url ='http://testing.shippingapis.com/ShippingAPITest.dll?'.$request;
-            -
                    }else {
-            -
                        $url = 'http://'.$usps_server.'/' . $api_dll . '?' . $request;
-            -
                    }
-            -
                    $ch=curl_init();
-            -
                    curl_setopt($ch, CURLOPT_URL, $url);
-            -
                    curl_setopt($ch, CURLOPT_NOPROGRESS, 1);
-            -
                    curl_setopt($ch, CURLOPT_VERBOSE, 1);
-            -
                    @ curl_setopt($ch, CURLOPT_FOLLOWLOCATION,1);
-            -
                    curl_setopt($ch, CURLOPT_TIMEOUT, 120);
-            -
                    curl_setopt($ch, CURLOPT_USERAGENT, 'wp-e-commerce');
-            -
                    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            -
                    $body = curl_exec($ch);
-            -
                    curl_close($ch);
-            -
                    $rates=array();
-            -
                    $response=array();
-            -
                    while (true) {
-            -
                        if ($start = strpos($body, '<Package ID=')) {
-            -
                            $body = substr($body, $start);
-            -
                            $end = strpos($body, '</Package>');
-            -
                            $response[] = substr($body, 0, $end+10);
-            -
                            $body = substr($body, $end+9);
-            -
                        } else {
-            -
                            break;
-            -
                        }
-            -
                    }
-            -
                    $rates = array();
-            -
                    if ($dest == get_option('base_country')) {
-            -
                        if (sizeof($response) == '1') {
-            -
                            if (ereg('<Error>', $response[0])) {
-            -
                                $number = ereg('<Number>(.*)</Number>', $response[0], $regs);
-            -
                                $number = $regs[1];
-            -
                                $description = ereg('<Description>(.*)</Description>', $response[0], $regs);
-            -
                                $description = $regs[1];
-            -
                            }
-            -
                        }
-            -
-            -
                        $n = sizeof($response);
-            -
                        for ($i=0; $i<$n; $i++) {
-            -
                            if (strpos($response[$i], '<Rate>')) {
-            -
                                $service = ereg('<MailService>(.*)</MailService>', $response[$i], $regs);
-            -
                                $service = $regs[1];
-            -
                                $postage = ereg('<Rate>(.*)</Rate>', $response[$i], $regs);
-            -
                                $postage = $regs[1];
-            -
                                $postage = $postage + get_option('usps_extra_cost');
-            -
                                if($postage <= 0) {
-            -
                                    continue;
-            -
                                }
-            -
                                $rates += array($service => $postage);
-            -
                                if ($transit) {
-            -
                                    switch ($service) {
-            -
                                        case 'EXPRESS':     $time = ereg('<MonFriCommitment>(.*)</MonFriCommitment>', $transresp[$service], $tregs);
-            -
                                            $time = $tregs[1];
-            -
                                            if ($time == '' || $time == 'No Data') {
-            -
                                                $time = 'Estimated 1 - 2 ' . 'Days';
-            -
                                            } else {
-            -
                                                $time = 'Tomorrow by ' . $time;
-            -
                                            }
-            -
                                            break;
-            -
                                        case 'PRIORITY':    $time = ereg('<Days>(.*)</Days>', $transresp[$service], $tregs);
-            -
                                            $time = $tregs[1];
-            -
                                            if ($time == '' || $time == 'No Data') {
-            -
                                                $time = 'Estimated 1 - 3 ' . 'Days';
-            -
                                            } elseif ($time == '1') {
-            -
                                                $time .= ' ' . 'Day';
-            -
                                            } else {
-            -
                                                $time .= ' ' . 'Days';
-            -
                                            }
-            -
                                            break;
-            -
                                        case 'PARCEL':      $time = ereg('<Days>(.*)</Days>', $transresp[$service], $tregs);
-            -
                                            $time = $tregs[1];
-            -
                                            if ($time == '' || $time == 'No Data') {
-            -
                                                $time = 'Estimated 2 - 9 ' . 'Days';
-            -
                                            } elseif ($time == '1') {
-            -
                                                $time .= ' ' . 'Day';
-            -
                                            } else {
-            -
                                                $time .= ' ' . 'Days';
-            -
                                            }
-            -
                                            break;
-            -
                                        case 'First-Class Mail':
-            -
                                            $time = 'Estimated 1 - 5 ' . 'Days';
-            -
                                            break;
-            -
                                        case 'MEDIA':
-            -
                                            $time = 'Estimated 2 - 9 ' . 'Days';
-            -
                                            break;
-            -
                                        case 'BPM':
-            -
                                            $time = 'Estimated 2 - 9 ' . 'Days';
-            -
                                            break;
-            -
                                        default:
-            -
                                            $time = '';
-            -
                                            break;
-            -
                                    }
-            -
                                    if ($time != '') $transittime[$service] = ': ' . $time . '';
-            -
                                }
-            -
                            }
-            -
                        }
-            -
                        $wpsc_usps_quote = $rates;
-            -
                    } else {
-            -
                        if (ereg('<Error>', $response[0])) {
-            -
                            $number = ereg('<Number>(.*)</Number>', $response[0], $regs);
-            -
                            $number = $regs[1];
-            -
                            $description = ereg('<Description>(.*)</Description>', $response[0], $regs);
-            -
                            $description = $regs[1];
-            -
                        } else {
-            -
                            $body = $response[0];
-            -
                            $services = array();
-            -
                            while (true) {
-            -
                                if ($start = strpos($body, '<Service ID=')) {
-            -
                                    $body = substr($body, $start);
-            -
                                    $end = strpos($body, '</Service>');
-            -
                                    $services[] = substr($body, 0, $end+10);
-            -
                                    $body = substr($body, $end+9);
-            -
                                } else {
-            -
                                    break;
-            -
                                }
-            -
                            }
-            -
-            -
                            $allowed_types = Array( 'EXPRESS MAIL INT' => "Express Mail International (EMS)", 'EXPRESS MAIL INT FLAT RATE ENV' => "Express Mail International (EMS) Flat-Rate Envelope", 'PRIORITY MAIL INT' => "Priority Mail International", 'PRIORITY MAIL INT FLAT RATE ENV' => "Priority Mail International Flat-Rate Envelope", 'PRIORITY MAIL INT FLAT RATE BOX' => "Priority Mail International Flat-Rate Box", 'FIRST-CLASS MAIL INT' => "First Class Mail International Letters" );
-            -
-            -
                            $size = sizeof($services);
-            -
                            for ($i=0, $n=$size; $i<$n; $i++) {
-            -
                                if (strpos($services[$i], '<Postage>')) {
-            -
                                    $service = ereg('<SvcDescription>(.*)</SvcDescription>', $services[$i], $regs);
-            -
                                    $service = $regs[1];
-            -
                                    $postage = ereg('<Postage>(.*)</Postage>', $services[$i], $regs);
-            -
                                    $postage = $regs[1];
-            -
                                    $time = ereg('<SvcCommitments>(.*)</SvcCommitments>', $services[$i], $tregs);
-            -
                                    $time = $tregs[1];
-            -
                                    $time = preg_replace('/Weeks$/', 'Weeks',$time);
-            -
                                    $time = preg_replace('/Days$/', 'Days', $time);
-            -
                                    $time = preg_replace('/Day$/', 'Day', $time);
-            -
                                    if( !in_array($service, $allowed_types) || ($postage < 0) ) continue;
-            -
                                    $postage = $postage + get_option('usps_extra_cost');
-            -
                                    $rates += array($service => $postage);
-            -
                                    if ($time != '') $transittime[$service] = ' (' . $time . ')';
-            -
                                }
-            -
                            }
-            -
                        }
-            -
                    }
-            -
                    $uspsQuote=$rates;
-            -
                    $wpsc_usps_quote = $rates;
-            -
                    return $uspsQuote;
-            -
                }
-            -
-            -
                function get_item_shipping() {
-            -
                }
-            -
            }
-            -
            $usps = new usps();
-            -
            $wpsc_shipping_modules[$usps->getInternalName()] = $usps;
-            -
            ?>

wpsc-shipping/usps_20.php ADDED Viewed

	@@ -0,0 +1,927 @@


1	+ <?php
2	+ /**
3	+ * New USPS module for V4 Domestic RateRequest API and V2 International Rate Request
4	+ * @author Greg Gullett (ecsquest.net) and Instinct.co.nz
5	+ * @version 2.1
6	+ */
7	+ class ash_usps{
8	+ /**
9	+ * The USPS User ID for the API user Account
10	+ * @var string
11	+ */
12	+ var $usps_id;
13	+ /**
14	+ * The USPS password for the API user account
15	+ * @var string
16	+ * @deprecated Deprecated since 2.0
17	+ */
18	+ var $usps_password;
19	+ /**
20	+ * The name that the USPS class identifies itself as to internal systems
21	+ * default "usps" Don't change unless you know what you are doing!
22	+ * @var string
23	+ */
24	+ var $internal_name = "ash_usps";
25	+ /**
26	+ *
27	+ * The external name that the USPS class identifies itself.
28	+ * This is the "prettier" version of $internal_name to be shown to end-users.
29	+ * @var string
30	+ */
31	+ var $name="USPS";
32	+ /**
33	+ * This flag is used by WP-E-Commerce to denote whether or not
34	+ * it accesses an external API to provide shipping rates and requires cURL
35	+ * @var boolean
36	+ */
37	+ var $is_external=TRUE;
38	+ /**
39	+ * This flag is used by WP-E-Commerce to denote whether or not
40	+ * it requires a zipcode to process the quote.
41	+ * @var boolean
42	+ */
43	+ var $needs_zipcode=TRUE;
44	+ /**
45	+ * This flag is used by USPS (Not locked to WPEC) to denote which
46	+ * endpoint / rating environment it is to use.
47	+ * True = Use Testing Environment API Endpoint
48	+ * False = Use Production Environment API Endpoint
49	+ * @since 2.0
50	+ * @var boolean
51	+ */
52	+ var $use_test_env = FALSE;
53	+ /**
54	+ * This stores an ASHShipment instance object used in rating
55	+ * @var ASHShipment\|Null
56	+ */
57	+ var $shipment=NULL;
58	+
59	+ /**
60	+ * Constructor for USPS class
61	+ * Automatically loads services that are available into the class instance
62	+ * @since 1.0
63	+ */
64	+ function ash_usps(){
65	+ $this->_load_services();
66	+ return TRUE;
67	+ }
68	+
69	+ /**
70	+ * retrieves the USPS ID, not used
71	+ * This function only exists due to legacy code
72	+ * @since 1.0
73	+ * @deprecated deprecated since version 2.0
74	+ * @return string
75	+ */
76	+ function getID(){
77	+ return $this->$usps_id;
78	+ }
79	+
80	+ /**
81	+ * Sets the USPS ID, not used
82	+ * This function only exists due to legacy code, unused
83	+ * @since 1.0
84	+ * @param int $id
85	+ * @deprecated deprecated since version 2.0
86	+ */
87	+ function setId($id){
88	+ $this->$usps_id = $id;
89	+ }
90	+
91	+ /**
92	+ * Retrieves the external display name for the module
93	+ * @since 1.0
94	+ * @return string
95	+ */
96	+ function getName() {
97	+ return $this->name;
98	+ }
99	+
100	+ /**
101	+ * Retrieves internal name of the module
102	+ * @since 1.0
103	+ * @return string
104	+ */
105	+ function getInternalName(){
106	+ return $this->internal_name;
107	+ }
108	+
109	+ /**
110	+ * Houses the list of services available to USPS API.
111	+ * The majority is commented out until a proper
112	+ * Service->Package map can be created
113	+ * @author Greg Gullett (greg@ecsquest.com)
114	+ * @since 2.0
115	+ */
116	+ function _load_services(){
117	+ $services = array(
118	+ // "Online Only *"=>"ONLINE",
119	+ // "All Services"=>"ALL",
120	+ "Parcel Post"=>"PARCEL",
121	+ // "Media Mail"=>"MEDIA",
122	+ // "Library Mail"=>"LIBRARY",
123	+ "First Class"=>"FIRST CLASS",
124	+ // "First Class Hold For Pickup Commercial"=>"FIRST CLASS HFP COMMERCIAL",
125	+ "Priority Mail"=>"PRIORITY",
126	+ // "Priority Commercial"=>"PRIORITY COMMERCIAL",
127	+ // "Priority Hold For Pickup Commercial"=>"PRIORITY HFP COMMERCIAL",
128	+ "Express Mail"=>"EXPRESS",
129	+ // "Express Commerical"=>"EXPRESS COMMERCIAL",
130	+ // "Express SH"=>"EXPRESS SH",
131	+ // "Express SH Commercial"=> "EXPRESS SH COMMERCIAL",
132	+ // "Express Hold for Pickup"=> "EXPRESS HFP",
133	+ // "Express Hold for Pickup Commercial"=>"EXPRESS HFP COMMERCIAL"
134	+ );
135	+ $this->services = $services;
136	+
137	+ }
138	+
139	+ /**
140	+ * Provides the appropriate endpoint for the API to use to
141	+ * retrieve rates from USPS
142	+ * @author Greg Gullett (greg@ecsquest.com)
143	+ * @since 2.0
144	+ * @param boolean $intl Flag denotes if we are getting international rates or not, Default FALSE
145	+ * @return string The endpoint / URL
146	+ */
147	+ function _get_endpoint($intl=FALSE){
148	+ $end_points = array(
149	+ "prod"=>array("server"=>"production.shippingapis.com",
150	+ "dll"=>"ShippingAPI.dll"
151	+ ),
152	+ "test"=>array("server"=>"testing.shippingapis.com",
153	+ "dll"=>"ShippingAPITest.dll"
154	+ ),
155	+ );
156	+
157	+ $api = "RateV4";
158	+ if ($intl){
159	+ $api = "IntlRateV2";
160	+ }
161	+
162	+ $env = "prod";
163	+ if((boolean)$this->use_test_env === TRUE){
164	+ $env = "test";
165	+ }
166	+
167	+ return "http://".$end_points[$env]["server"]."/".$end_points[$env]["dll"]."?".$api;
168	+ }
169	+
170	+ /**
171	+ * Returns the settings form that controls the USPS API information
172	+ * @since 1.0
173	+ */
174	+ function getForm() {
175	+ $settings = get_option("wpec_usps", array("ID"=>"",""));
176	+
177	+ $checked = '';
178	+ if($settings["test_server"] == '1'){
179	+ $checked = 'checked = "checked"';
180	+ }
181	+
182	+ $checked_adv = '';
183	+ if($settings["adv_rate"] == '1'){
184	+ $checked_adv = 'checked = "checked"';
185	+ }
186	+
187	+ $output=("
188	+ <tr>
189	+ <td>
190	+ ".__('USPS ID', 'wpsc').":
191	+ </td>
192	+ <td>
193	+ <input type='text' name='wpec_usps[id]' value='".$settings["id"]."' />
194	+
195	+ <br />
196	+ ".__("Don't have a USPS API account ? ",'wpsc')."
197	+
198	+ <a href=\"https://secure.shippingapis.com/registration/\" target=\"_blank\" >".__('Click Here','wpsc')."</a>
199	+ </td>
200	+ </tr>
201	+ <tr>
202	+ <td>
203	+ ".__('Use Test Server:','wpsc')."
204	+ </td>
205	+ <td>
206	+ <input type='checkbox' ".$checked." name='wpec_usps[test_server]' value='1' />
207	+
208	+ Yes
209	+ </td>
210	+ </tr>
211	+ <tr>
212	+ <td>
213	+ ".__('Advanced Rates:','wpsc')."
214	+ </td>
215	+ <td>
216	+ <input type='checkbox' ".$checked_adv." name='wpec_usps[adv_rate]' value='1' />
217	+
218	+ Yes
219	+ <br />
220	+ <span style=\"font-size: x-small\">".__("This setting will provide rates based on the dimensions from eacy item in your cart","wpec")."</span>
221	+ </td>
222	+ </tr>
223	+ <tr>
224	+ <td>".__('Select Services','wpsc')."</td>
225	+ <td>
226	+ <div id=\"resizeable\" class=\"ui-widget-content multiple-select\">");
227	+ $wpec_usps_services = (array)$settings["services"];
228	+ if (count($wpec_usps_services) < 1){
229	+ // If no selections have been made, default selection to ONLINE, that is what the old USPS essentially rated
230	+ array_push($wpec_usps_services, "ONLINE");
231	+ }
232	+
233	+ foreach($this->services as $label=>$service){
234	+ $checked = "";
235	+ if ((array_search($service, $wpec_usps_services) !== false)){
236	+ $checked = "checked=\"checked\"";
237	+ }
238	+ $output .= ("<input type=\"checkbox\" id=\"wpec_usps_srv_$service\" name=\"wpec_usps[services][]\" value=\"".$service."\" $checked />
239	+ <label for=\"wpec_usps_srv_$service\">".$label."</label>
240	+ <br />");
241	+ }
242	+
243	+ $output .= (" </div><!--
244	+ <span style=\"font-size: x-small\">".__("Online rates the following services only, when available",'wpsc')."
245	+ <br />
246	+ US Domestic: Express Mail, Priority Mail
247	+ <br />
248	+ International : Global Express Guarenteed, Express Mail Intl. , Priority Mail Intl.
249	+ </span>
250	+ <br />
251	+ -->
252	+ </td>
253	+ </tr>
254	+ <tr>
255	+ <td>
256	+ ".__("International Package Type","wpsc")."
257	+ </td>
258	+ <td>
259	+ ");
260	+ $mt_array = array(
261	+ "Package",
262	+ "Envelope",
263	+ "Postcards or aerogrammes",
264	+ "Matter for the Blind",
265	+ //"All"
266	+ );
267	+ $mt_selected = (array_key_exists("intl_pkg", $settings)) ? $settings["intl_pkg"] : "Package";
268	+ $output .= "<select id=\"wpec_usps_intl_pkg\" name=\"wpec_usps[intl_pkg]\">";
269	+ foreach($mt_array as $mt){
270	+ $chk_mt = "";
271	+ if ($mt == $mt_selected){ $chk_mt = 'selected=\"selected\"'; }
272	+ $output .= "<option value=\"".$mt."\" ".$chk_mt." >".$mt."</option>\n";
273	+ }
274	+ $output .= (" </select>
275	+ </td>
276	+ </tr>
277	+ <tr>
278	+ <td>
279	+ ".__("First Class Mail Type", "wpsc")."
280	+ </td>
281	+ <td>
282	+ ");
283	+
284	+ // If First Class, Online or All is selected then we need to know what Kind of First class
285	+ // will be used.
286	+ $fcl_types = array("Parcel"=>"PARCEL", "Letter"=>"LETTER", "Flat"=>"FLAT", "Postcard"=>"POSTCARD");
287	+ $type_selected = (array_key_exists("fcl_type",$settings)) ? $settings["fcl_type"] : $fcl_types["Parcel"];
288	+
289	+ $output .=("
290	+ <select id =\"\first_cls_type\" name=\"wpec_usps[fcl_type]\">
291	+ ");
292	+ foreach($fcl_types as $label=>$value){
293	+ $type_sel = "";
294	+ if ($value == $type_selected){
295	+ $type_sel = "selected=\"selected\"";
296	+ }
297	+ $output .= "<option value=\"".$value."\" ".$type_sel." >".$label."</option>\n";
298	+ }
299	+ $output .=("
300	+ </select>
301	+ <br />
302	+ <span style=\"font-size: x-small\" >Note : ".__("Only used for First Class service rates if selected","wpsc")."</span>
303	+ </td>
304	+ </tr>");
305	+ return $output;
306	+ }
307	+
308	+ /**
309	+ * This is called when the form provided from get_form is submitted
310	+ * @since 1.0
311	+ */
312	+ function submit_form() {
313	+ // Completely revamped how these values are stored
314	+ if (!empty($_POST['wpec_usps'])) {
315	+ update_option('wpec_usps', $_POST['wpec_usps']);
316	+ }
317	+ return TRUE;
318	+ }
319	+
320	+ /**
321	+ * This is a temporary hack until I can
322	+ * build a UI to build "Service Packages" so you can designate
323	+ * all of these based on services
324	+ * @author Greg Gullett (greg@ecsquest.com)
325	+ * @since 2.0
326	+ * @param array $base
327	+ * @param string $service
328	+ * @param ASHPackage $package
329	+ */
330	+ function _translate_package_options(&$base, $service, $package=FALSE){
331	+ $container = "";
332	+ $machinable = "true";
333	+ $size = "REGULAR";
334	+ switch($service){
335	+ case "PRIORITY":
336	+ $container = "FLAT RATE ENVELOPE";
337	+ break;
338	+ case "EXPRESS":
339	+ $container = "FLAT RATE ENVELOPE";
340	+ break;
341	+ case "PARCEL":
342	+ $container = "VARIABLE";
343	+ $machinable = "true";
344	+ $size = "REGULAR";
345	+ break;
346	+ case "ALL":
347	+ $machinable = "true";
348	+ break;
349	+ case "ONLINE":
350	+ $machinable = "true";
351	+ break;
352	+ }
353	+ $base["Container"] = $container;
354	+ $base["Size"] = $size;
355	+ if ($package){
356	+ $base["Width"] = $package->width;
357	+ $base["Length"] = $package->length;
358	+ $base["Height"] = $package->height;
359	+ $base["Girth"] = $package->girth;
360	+ // $base["SpecialServices"] = ""; // Its here, not ready for it yet, think ASH 1.0 or higher.
361	+ }
362	+ $base["Machinable"] = $machinable;
363	+ }
364	+
365	+ /**
366	+ * Helper function that builds the list of packages for domestic rating
367	+ * @author Greg Gullett (greg@ecsquest.com)
368	+ * @since 2.0
369	+ * @param array reference $request
370	+ * @param array $data
371	+ * @param ASHPackage $package
372	+ * @return array
373	+ */
374	+ function _build_domestic_shipment(&$request,$data, $package){
375	+ $shipment = array();
376	+ if ($package){
377	+ $data["weight"] = $package->weight;
378	+ }
379	+ $pound = floor($data["weight"]);
380	+ $ounce = ($data["weight"]-$pound) * 16;
381	+ $data["pound"] = $pound;
382	+ $data["ounce"] = $ounce;
383	+
384	+ if (!array_key_exists("services",(array)$data)){
385	+ $data["services"] = array("ONLINE");
386	+ }
387	+ $base = array(
388	+ "ZipOrigination"=>$data["base_zipcode"],
389	+ "ZipDestination"=>$data["dest_zipcode"],
390	+ "Pounds"=>$data["pound"],
391	+ "Ounces"=>$data["ounce"],
392	+ );
393	+ foreach($data["services"] as $label=>$service){
394	+ $temp = array();
395	+ $temp["Service"] = $service;
396	+ $temp["@attr"] = array("ID"=>count($shipment));
397	+
398	+ if ($ounce > 13 \|\| $pound > 1 ){
399	+ if(strpos($service,"FIRST") === FALSE \|\| $service == "ONLINE"){
400	+ $temp["FirstClassMailType"] = $data["fcl_type"];
401	+ $temp = array_merge($temp, $base);
402	+ $this->_translate_package_options($temp, $service, $package);
403	+ array_push($shipment, $temp);
404	+ }
405	+ }else{
406	+ if(strpos($service,"FIRST") !== FALSE \|\| $service == "ONLINE"){
407	+ $temp["FirstClassMailType"] = $data["fcl_type"];
408	+ $temp = array_merge($temp, $base);
409	+ $this->_translate_package_options($temp, $service, $package);
410	+ }else{
411	+ $temp = array_merge($temp, $base);
412	+ $this->_translate_package_options($temp, $service, $package);
413	+ }
414	+ array_push($shipment, $temp);
415	+ }
416	+ }
417	+ $request[$data["req"]]["Package"] = $shipment;
418	+ }
419	+
420	+ /**
421	+ * Helper function that builds the list of packages for international rating
422	+ * @author Greg Gullett (greg@ecsquest.com)
423	+ * @since 2.0
424	+ * @param array reference $request
425	+ * @param array $data
426	+ * @param ASHPackage $package
427	+ * @return array
428	+ */
429	+ function _build_intl_shipment(&$request,$data,$package){
430	+ $shipment = array();
431	+
432	+ $data["pounds"] = floor($package->weight);
433	+ $data["ounces"] = ($data["weight"]-$data["pounds"]) * 16;
434	+
435	+ if (!array_key_exists("mail_type",(array)$data)){
436	+ $data["mail_type"] = array("Package");
437	+ }
438	+
439	+ $base = array( "Pounds"=>$data["pounds"],
440	+ "Ounces"=>$data["ounces"],
441	+ "Machinable"=>"True",
442	+ "MailType"=>$data["mail_type"],
443	+ "GXG"=>array("POBoxFlag"=>"N","GiftFlag"=>"N"),
444	+ "ValueOfContents"=>$data["value"],
445	+ "Country"=>$data["dest_country"],
446	+ "Container"=>"RECTANGULAR",
447	+ "Size"=>"LARGE",
448	+ "Width"=>$package->width,
449	+ "Length"=>$package->length,
450	+ "Height"=>$package->height,
451	+ "Girth"=>$package->girth,
452	+ "OriginZip"=>$data["base_zipcode"],
453	+ "CommercialFlag"=>"Y"
454	+ );
455	+
456	+ $temp = $base;
457	+ $temp["@attr"]["ID"] = 0;
458	+ array_push($shipment, $temp);
459	+ $request[$data["req"]]["Package"] = $shipment;
460	+ }
461	+
462	+ /**
463	+ * Used to build request to send to USPS API
464	+ * @author Greg Gullett (greg@ecsquest.com)
465	+ * @since 2.0
466	+ * @param array $data
467	+ * @return array
468	+ */
469	+ function _build_request(&$data){
470	+ global $wpec_ash_xml;
471	+ $req = "RateV4Request";
472	+ if ($data["dest_country"] != "USA"){
473	+ $req = "IntlRateV2Request";
474	+ }
475	+ $data["req"] = $req;
476	+ $request = array($req=>array(
477	+ "@attr"=>array("USERID"=>$data["user_id"]),
478	+ "Revision"=>"2"
479	+ )
480	+ );
481	+ return $request;
482	+ }
483	+
484	+ /**
485	+ * Handles contacting the USPS server via cURL
486	+ * @author Greg Gullett (greg@ecsquest.com)
487	+ * @since 2.0
488	+ * @param string $request is the raw XML request
489	+ * @param boolean $intl flag to denote if it is US Domestic or International
490	+ * @return string XML Response from USPS API
491	+ */
492	+ function _make_request($request, $intl=false){
493	+ // Get the proper endpoint to send request to
494	+ $endpoint = $this->_get_endpoint($intl);
495	+ // Need to url encode the XML for the request
496	+ $encoded_request = urlencode($request);
497	+ // Put endpoint and request together
498	+ $url = $endpoint."&XML=".$encoded_request;
499	+ // Make the request
500	+ $ch=curl_init();
501	+ curl_setopt($ch, CURLOPT_URL, $url);
502	+ curl_setopt($ch, CURLOPT_NOPROGRESS, 1);
503	+ curl_setopt($ch, CURLOPT_VERBOSE, 1);
504	+ @curl_setopt($ch, CURLOPT_FOLLOWLOCATION,1);
505	+ curl_setopt($ch, CURLOPT_TIMEOUT, 120);
506	+ curl_setopt($ch, CURLOPT_USERAGENT, 'wp-e-commerce');
507	+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
508	+ $body = curl_exec($ch);
509	+ curl_close($ch);
510	+
511	+ return $body;
512	+ }
513	+
514	+ /**
515	+ * USPS seems to be not able to encode their own XML appropriately
516	+ * This function is used to fix their mistakes.
517	+ * @author Greg Gullett (greg@ecsquest.com)
518	+ * @since 2.0
519	+ * @param string $response Reference to the $response string
520	+ */
521	+ function _clean_response(&$response){
522	+ $bad_encoding = array("&lt;sup&gt;&amp;", ";&lt;/sup&gt;");
523	+ $good_encoding = array("<sup>","</sup>");
524	+ $response = str_replace($bad_encoding, $good_encoding, $response);
525	+ }
526	+
527	+ /**
528	+ * Parse the service out of the package
529	+ * @author Greg Gullett (greg@ecsquest.com)
530	+ * @since 2.0
531	+ * @param string $package
532	+ * @return string
533	+ */
534	+ function _get_service($ServiceTag,$package){
535	+ global $wpec_ash_xml;
536	+ $service = "";
537	+ $temp_service = $wpec_ash_xml->get($ServiceTag,$package);
538	+
539	+ if ($temp_service){
540	+ $service = $temp_service[0];
541	+ }
542	+
543	+ preg_match('/(.*?)<sup>/', $service, $temp);
544	+ if (!empty($temp)){
545	+ $service = $temp[1];
546	+ }
547	+
548	+ return $service;
549	+ }
550	+
551	+ /**
552	+ * Merges N-Many arrays together by key, without replacement
553	+ * @author Greg Gullett (greg@ecsquest.com)
554	+ * @since 2.0
555	+ * @param array $arrays
556	+ * @return array
557	+ */
558	+ function _merge_arrays(array $arrays){
559	+ $final_array = array();
560	+ foreach($arrays as $arr){
561	+ foreach($arr as $key=>$value){
562	+ if (!array_key_exists($key, $final_array)){
563	+ if ($value){
564	+ $final_array[$key] = $value;
565	+ }
566	+ }elseif($final_array[$key] < $value){
567	+ $final_array[$key] = $value;
568	+ }
569	+ }
570	+ }
571	+ return $final_array;
572	+ }
573	+
574	+ /**
575	+ * This function parses the provided XML response from USPS to retrieve the final rates.
576	+ * @author Greg Gullett (greg@ecsquest.com)
577	+ * @since 2.0
578	+ * @param string $response The XML response from USPS
579	+ * @return array
580	+ */
581	+ function _parse_domestic_response($response){
582	+ global $wpec_ash_xml;
583	+ $package_services = array();
584	+ $this->_clean_response($response);
585	+
586	+ $packages = $wpec_ash_xml->get("Package", $response);
587	+
588	+ foreach($packages as $package){
589	+ $temp = array();
590	+ $postage_services = $wpec_ash_xml->get("Postage", $package);
591	+ if (count($postage_services) == 1 ){
592	+ $postage_services = array($package);
593	+ }
594	+ foreach($postage_services as $postage){
595	+ $service_name = $this->_get_service("MailService",$postage);
596	+ $temp_rate = $wpec_ash_xml->get("Rate",$postage);
597	+ $rate = (!empty($temp_rate)) ? $temp_rate[0] : 0.0;
598	+ if (!empty($service_name)){
599	+ $temp[$service_name] = $rate;
600	+ }
601	+ }
602	+ array_push($package_services, $temp);
603	+ }
604	+ return $package_services;
605	+ }
606	+
607	+ /**
608	+ * This function parses the provided XML response for international requests
609	+ * from USPS to retrieve the final rates as an array.
610	+ * @author Greg Gullett (greg@ecsquest.com)
611	+ * @since 2.0
612	+ * @param string $response The XML response from USPS
613	+ * @return array
614	+ */
615	+ function _parse_intl_response($response){
616	+ global $wpec_ash_xml;
617	+ $services_table = array();
618	+ $this->_clean_response($response);
619	+
620	+ $services = $wpec_ash_xml->get("Service", $response);
621	+ if (!$services){
622	+
623	+ }
624	+ foreach($services as $service){
625	+ $service_name = $this->_get_service("SvcDescription",$service);
626	+ $temp_rate = $wpec_ash_xml->get("Postage",$service);
627	+ $rate = (!empty($temp_rate)) ? $temp_rate[0] : 0.0;
628	+ if (!empty($service)){
629	+ $service_table[$service_name] = $rate;
630	+ }
631	+ }
632	+ return $service_table;
633	+ }
634	+
635	+ /**
636	+ * Returns an array using the common keys from all arrasy and the sum of those common keys values;
637	+ * @author Greg Gullett (greg@ecsquest.com)
638	+ * @since 2.0
639	+ * @param array $rate_tables
640	+ * @return array
641	+ */
642	+ function _combine_rates($rate_tables){
643	+ $final_table = array();
644	+ if (!is_array($rate_tables)){
645	+ return array();
646	+ }
647	+ if (count($rate_tables) < 2){
648	+ return $rate_tables[0];
649	+ }
650	+ $temp_services = call_user_func_array("array_intersect_key", $rate_tables);
651	+
652	+ $valid_services = array_keys($temp_services);
653	+ foreach($rate_tables as $rate_table){
654	+ foreach($rate_table as $service=>$rate){
655	+ if (in_array($service,$valid_services)){
656	+ if (!array_key_exists($service, $final_table)){
657	+ $final_table[$service] = 0;
658	+ }
659	+ $final_table[$service] += $rate;
660	+ }
661	+ }
662	+ }
663	+ return $final_table;
664	+ }
665	+
666	+ /**
667	+ * Merges arrays and adds the values of common keys.
668	+ * @author Greg Gullett (greg@ecsquest.com)
669	+ * @since 2.0
670	+ * @param array $arrays
671	+ * @return array
672	+ */
673	+ function merge_sum_arrays($arrays){
674	+ $temp = array();
675	+ if (!is_array($arrays)){
676	+ return array();
677	+ }
678	+ if (count($arrays) > 1){
679	+ $temp_arr = call_user_func_array("array_intersect_key", $arrays);
680	+ $intersect_keys = array_keys((array)$temp_arr);
681	+ }else{
682	+ $intersect_keys = array_keys($arrays[0]);
683	+ }
684	+
685	+ foreach($arrays as $arr){
686	+ foreach($arr as $key=>$value){
687	+ if (in_array($key,(array)$intersect_keys)){
688	+ if(!array_key_exists($key,$temp)){
689	+ $temp[$key] = 0;
690	+ }
691	+ $temp[$key] += $value;
692	+ }
693	+ }
694	+ }
695	+ return $temp;
696	+ }
697	+
698	+ /**
699	+ * Runs the quote process for a simple quote and returns the final quote table
700	+ * @author Greg Gullett (greg@ecsquest.com)
701	+ * @since 2.0
702	+ * @param array $data
703	+ * @return array
704	+ */
705	+ function _quote_simple(array $data){
706	+ global $wpec_ash_xml;
707	+ //* Build Request \\
708	+ $request = $this->_build_request($data);
709	+ $this->_build_domestic_shipment($request, $data, FALSE);
710	+ $request_xml = $wpec_ash_xml->build_message($request);
711	+ //* Make the Request *\\
712	+ $response = $this->_make_request($request_xml,FALSE);
713	+ //* Parse the response from USPS *\
714	+ $package_rate_table = $this->_parse_domestic_response($response);
715	+ $rate_table = $this->_merge_arrays($package_rate_table);
716	+ return $rate_table;
717	+ }
718	+
719	+ /**
720	+ * Runs the quote process for an advanced quote and returns the final quote table
721	+ * @author Greg Gullett (greg@ecsquest.com)
722	+ * @since 2.0
723	+ * @param array $data
724	+ * @return array
725	+ */
726	+ function _quote_advanced(array $data){
727	+ global $wpec_ash_xml;
728	+ $rate_tables = array();
729	+ foreach($this->shipment->packages as $package){
730	+ $temp_data = $data;
731	+ $request = $this->_build_request($temp_data);
732	+ $this->_build_domestic_shipment($request, $temp_data, $package);
733	+ $request_xml = $wpec_ash_xml->build_message($request);
734	+ //* Make the Request *\\
735	+ $response = $this->_make_request($request_xml,FALSE);
736	+ //* Parse the Response *\\
737	+ $package_rate_table = $this->_parse_domestic_response($response);
738	+ //* Reformat the array structure *\\
739	+ $temp = $this->_merge_arrays($package_rate_table);
740	+
741	+ array_push($rate_tables, $temp);
742	+ }
743	+
744	+ $rates = $this->merge_sum_arrays($rate_tables);
745	+ return $rates;
746	+ }
747	+
748	+ /**
749	+ * Runs the quote process for an international quote and returns the final quote table
750	+ * @author Greg Gullett (greg@ecsquest.com)
751	+ * @since 2.0
752	+ * @param array $data
753	+ * @return array
754	+ */
755	+ function _quote_intl(array $data){
756	+ global $wpec_ash_xml;
757	+ $rate_tables = array();
758	+ foreach($this->shipment->packages as $package){
759	+ $temp_data = $data;
760	+ $request = $this->_build_request($temp_data);
761	+ $this->_build_intl_shipment($request, $temp_data, $package);
762	+ $request_xml = $wpec_ash_xml->build_message($request);
763	+ //* Make the Request *\\
764	+ $response = $this->_make_request($request_xml,TRUE);
765	+ $rate_table = $this->_parse_intl_response($response);
766	+ array_push($rate_tables, $rate_table);
767	+ }
768	+ $rates = $this->_combine_rates($rate_tables);
769	+ return $rates;
770	+ }
771	+
772	+ /**
773	+ * Returns an updated country based on several rules that USPS has
774	+ * @author Greg Gullett (greg@ecsquest.com)
775	+ * @since 2.0
776	+ * @param string $full_name The countries full name
777	+ * @return string
778	+ *
779	+ * ::rules::
780	+ * U.K. Is an invalid name, they use Great Britain and Northern Ireland
781	+ * Any US Posession is rated as USA
782	+ */
783	+ function _update_country($full_name){
784	+ $us_posessions = array("Puerto Rico",
785	+ "Virgin Islands (USA)",
786	+ "USA Minor Outlying Islands",
787	+ "Guam (USA)");
788	+ if (in_array($full_name, $us_posessions)){
789	+ return "USA";
790	+ }
791	+ if ($full_name == "U.K."){
792	+ return 'Great Britain and Northern Ireland';
793	+ }
794	+ return $full_name;
795	+ }
796	+
797	+ /**
798	+ * Takes a rate table and returns a new table with only services selected in the back end
799	+ * @author Greg Gullett (greg@ecsquest.com)
800	+ * @since 2.0
801	+ * @param array $rate_table
802	+ * @param array $data
803	+ * @return array
804	+ */
805	+ function _validate_services($rate_table,$data){
806	+ global $wpdb;
807	+ if (!is_array($rate_table)){
808	+ return array();
809	+ }
810	+ $final_table = array();
811	+ $services = array();
812	+ foreach($this->services as $service=>$code){
813	+ if (in_array($code, $data["services"])){
814	+ $services[$service] = $code;
815	+ }
816	+ }
817	+ $valid_services = array_intersect_key((array)$rate_table, $services);
818	+ return $valid_services;
819	+ }
820	+
821	+ /**
822	+ * This function handles the process of getting a quote.
823	+ * It is kept abstracted from the entry points so you can
824	+ * implement a testing framework separate from wordpress.
825	+ * @author Greg Gullett (greg@ecsquest.com)
826	+ * @since 2.0
827	+ * @param array $data This is an array that USPS uses to build its request
828	+ *
829	+ * Expected Values for $data:
830	+ * Required : String : "fcl_type" : Is the First Class Package Type ("Package", "Envelope","Postcards or aerogrammes", "Matter for the Blind", "All")
831	+ * Required : Int : "base_zipcode" : The originating zipcode where the shipment is from
832	+ * Required : String : "user_id" : USPS user ID
833	+ * Required : Array : "services" : List of services to get rates for, One or More services required
834	+ */
835	+ function _run_quote(array $data){
836	+ global $wpec_ash_tools;
837	+ //************ These values are common to all entry points ************
838	+ //*** Grab Total Weight from the shipment object for simple shipping
839	+ $data["weight"] = $this->shipment->total_weight;
840	+ //* User/Customer Entered Values *\\
841	+ $data["dest_zipcode"] = $this->shipment->destination["zipcode"];
842	+ if (empty($data["weight"])){
843	+ return array();
844	+ }
845	+
846	+ if (empty($data["dest_zipcode"])){
847	+ return array();
848	+ }
849	+
850	+ if ($wpec_ash_tools->is_military_zip($data["dest_zipcode"])){
851	+ $data["dest_country"] = "USA";
852	+ }
853	+ //\\************ END common config ************\\//
854	+ //* Get the Quotes *\\
855	+ $quotes = array();
856	+ if ($data["dest_country"]== "USA" && $data["adv_rate"]==TRUE){
857	+ $quotes = $this->_quote_advanced($data);
858	+ }elseif($data["dest_country"] != "USA"){
859	+ $quotes = $this->_quote_intl($data);
860	+ }else{
861	+ $quotes = $this->_quote_simple($data);
862	+ }
863	+ $rate_table = $this->_validate_services($quotes, $data);
864	+ return $quotes;
865	+ }
866	+
867	+ /**
868	+ * This function is used to provide rates for single items
869	+ * Due to the nature of external calculators it is too costly to use this
870	+ * @deprecated Do Not Use
871	+ */
872	+ function get_item_shipping(){
873	+ }
874	+
875	+ /**
876	+ * General entry point for WPEC external shipping calculator
877	+ * This function expects no arguments but requires POST data
878	+ * and configuration from the plugin settings
879	+ * @return array $rate_table List of rates in "Service"=>"Rate" format
880	+ */
881	+ function getQuote(){
882	+ global $wpdb, $wpec_ash, $wpec_ash_tools;
883	+ $this->shipment = $wpec_ash->get_shipment();
884	+ $this->shipment->set_destination($this->internal_name);
885	+ // Check to see if the cached shipment is still accurate, if not we need new rate
886	+ $cache = $wpec_ash->check_cache($this->internal_name, $this->shipment);
887	+ //if ($cache){
888	+ // return $cache["rate_table"];
889	+ //}
890	+
891	+ $data = array();
892	+ //* WPEC Configuration values *\\
893	+ $settings = get_option("wpec_usps");
894	+ $this->env = $settings["test_server"];
895	+ $data["fcl_type"] = (!empty($settings["fcl_type"])) ? $settings["fcl_type"] : "PARCEL";
896	+ $data["mail_type"] = (!empty($settings["intl_pkg"])) ? $settings["intl_pkg"] : "Package";
897	+ $data["base_zipcode"] = get_option("base_zipcode");
898	+ $data["services"] = (!empty($settings["services"])) ? $settings["services"] : array("PRIORITY","EXPRESS","FIRST CLASS");
899	+ $data["user_id"] = $settings["id"];
900	+ $data["adv_rate"] = (!empty($settings["adv_rate"])) ? $settings["adv_rate"] : FALSE; // Use advanced shipping for Domestic Rates ? Not available
901	+ //* Set up the destination country *\
902	+ $country = $this->shipment->destination["country"];
903	+ $data["dest_country"] = $wpec_ash_tools->get_full_country($country);
904	+ $data["dest_country"] = $this->_update_country($data["dest_country"]);
905	+ //********** GET THE RATE **********\\
906	+ $rate_table = $this->_run_quote($data);
907	+ //********** CACHE the Results **********\\
908	+
909	+ $wpec_ash->cache_results($this->internal_name, $rate_table, $this->shipment);
910	+
911	+ return $rate_table;
912	+ }
913	+
914	+ /**
915	+ * A testing entrypoint to run a quote without
916	+ * access to wordpress/wpec settings & database
917	+ * @see run_quote() for required $data values
918	+ * @param array $data
919	+ */
920	+ function test($data,$shipment){
921	+ $this->shipment = $shipment;
922	+ return $this->_run_quote($data);
923	+ }
924	+
925	+ }
926	+ $ash_usps = new ash_usps();
927	+ $wpsc_shipping_modules[$ash_usps->getInternalName()] = $ash_usps;

wpsc-shipping/weightrate.php CHANGED Viewed

	@@ -45,7 +45,7 @@ class weightrate {
45	* @return unknown
46	*/
47	function getForm() {
48	-
49	$output.="<tr><th>".__('Total weight <br />(<abbr alt="You must enter the weight here in pounds, regardless of what you used on your products" title="You must enter the weight here in pounds, regardless of what you used on your products">in pounds</abbr>)', 'wpsc')."</th><th>".__('Shipping Price', 'wpsc')."</th></tr>";
50
51	$layers = get_option("weight_rate_layers");
	@@ -55,7 +55,7 @@ class weightrate {
55	foreach ($layers as $key => $shipping) {
56
57	$output.="<tr class='rate_row'><td >";
58	- $output .="<i style='color: grey;'>".__('If weight is ', 'wpsc')."</i><input type='text' value='$key' name='weight_layer[]'size='4'><i style='color: grey;'>".__(' and above', 'wpsc')."</i></td><td>".wpsc_get_currency_symbol()."<input type='text' value='{$shipping}' name='weight_shipping[]' size='4'>  <a href='#' class='delete_button' >".__('Delete', 'wpsc')."</a></td></tr>";
59
60	}
61
	@@ -80,14 +80,15 @@ class weightrate {
80	if (!isset($_POST['weight_shipping'])) {
81	$_POST['weight_shipping'] = '';
82	}

83	$layers = (array)$_POST['weight_layer'];
84	$shippings = (array)$_POST['weight_shipping'];
85
86	- if ($shippings ~~!= ''~~) {
87
88	foreach ($shippings as $key => $price) {
89
90	- if ($price ~~== ''~~) {
91
92	unset($shippings[$key]);
93	unset($layers[$key]);
	@@ -102,11 +103,8 @@ class weightrate {
102
103	}
104
105	- if ($_POST['checkpage'] == 'weight') {
106	-
107	update_option('weight_rate_layers', $new_layer);
108	-
109	- }
110	return true;
111	}
112


45	* @return unknown
46	*/
47	function getForm() {
48	+ $output = "";
49	$output.="<tr><th>".__('Total weight <br />(<abbr alt="You must enter the weight here in pounds, regardless of what you used on your products" title="You must enter the weight here in pounds, regardless of what you used on your products">in pounds</abbr>)', 'wpsc')."</th><th>".__('Shipping Price', 'wpsc')."</th></tr>";
50
51	$layers = get_option("weight_rate_layers");

55	foreach ($layers as $key => $shipping) {
56
57	$output.="<tr class='rate_row'><td >";
58	+ $output .="<i style='color: grey;'>".__('If weight is ', 'wpsc')."</i><input type='text' value='$key' name='weight_layer[]'size='4'><i style='color: grey;'>".__(' and above', 'wpsc')."</i></td><td>".wpsc_get_currency_symbol()."<input type='text' value='".esc_attr($shipping)."' name='weight_shipping[]' size='4'>  <a href='#' class='delete_button' >".__('Delete', 'wpsc')."</a></td></tr>";
59
60	}
61

80	if (!isset($_POST['weight_shipping'])) {
81	$_POST['weight_shipping'] = '';
82	}
83	+ $new_layer = '';
84	$layers = (array)$_POST['weight_layer'];
85	$shippings = (array)$_POST['weight_shipping'];
86
87	+ if ( !empty($shippings) ) {
88
89	foreach ($shippings as $key => $price) {
90
91	+ if ( empty($price) ) {
92
93	unset($shippings[$key]);
94	unset($layers[$key]);

103
104	}
105
106	+ if ($_POST['checkpage'] == 'weight' && !empty($new_layer))

107	update_option('weight_rate_layers', $new_layer);


108	return true;
109	}
110

wpsc-taxes/controllers/taxes_controller.class.php CHANGED Viewed

	@@ -293,6 +293,7 @@ class wpec_taxes_controller {
293	* @return: string containing html select menu
294	* */
295	function wpec_taxes_display_tax_bands( $input_settings=array( ), $custom_tax_band=false ) {

296	//if taxes are included and not disabled continue else notify customer
297	if ( $this->wpec_taxes_isincluded() && $this->wpec_taxes->wpec_taxes_get_enabled() ) {
298	//retrieve the bands and add the disabled value
	@@ -304,7 +305,7 @@ class wpec_taxes_controller {
304	$default_select_settings = array(
305	'id' => 'wpec_taxes_band',
306	'name' => 'wpec_taxes_band',
307	- 'label' => __( 'Custom Tax Band' )
308	);
309	$band_select_settings = wp_parse_args( $input_settings, $default_select_settings );
310
	@@ -405,7 +406,7 @@ class wpec_taxes_controller {
405	}elseif($key == 'value'){
406	$setting = stripslashes($setting);
407	}
408	- $returnable .= $key.'="'.$setting.'"';
409	}// foreach
410	//close the input
411	$returnable .= ' />';
	@@ -434,7 +435,7 @@ class wpec_taxes_controller {
434	function wpec_taxes_build_select_options( $input_array, $option_value, $option_text, $option_selected=false, $select_settings='' ) {
435	$returnable = '';
436	$options = '';
437	- ~~// exit~~(~~$option_value.'Now~~ ~~an <pre>'.print_r~~($input_array,1)~~.'</pre>'.$option_selected~~);
438	foreach ( $input_array as $value ) {
439	//if the selected value exists in the input array skip it and continue processing
440	if ( is_array( $value ) ) {
	@@ -516,7 +517,7 @@ class wpec_taxes_controller {
516	'id' => "band-name-{$key}",
517	'name' => "wpsc_options[wpec_taxes_{$type}][{$key}][name]",
518	'class' => 'taxes-band',
519	- 'label' => __( 'Name' )
520	);
521	$bands_hidden_index = array(
522	'type' => 'hidden',
	@@ -530,7 +531,7 @@ class wpec_taxes_controller {
530	'id' => "shipping-{$key}",
531	'name' => "wpsc_options[wpec_taxes_{$type}][{$key}][shipping]",
532	'class' => "taxes-{$type}",
533	- 'label' => __( 'Apply to Shipping' )
534	);
535	}// if
536


293	* @return: string containing html select menu
294	* */
295	function wpec_taxes_display_tax_bands( $input_settings=array( ), $custom_tax_band=false ) {
296	+ $returnable = '';
297	//if taxes are included and not disabled continue else notify customer
298	if ( $this->wpec_taxes_isincluded() && $this->wpec_taxes->wpec_taxes_get_enabled() ) {
299	//retrieve the bands and add the disabled value

305	$default_select_settings = array(
306	'id' => 'wpec_taxes_band',
307	'name' => 'wpec_taxes_band',
308	+ 'label' => __( 'Custom Tax Band', 'wpsc' )
309	);
310	$band_select_settings = wp_parse_args( $input_settings, $default_select_settings );
311

406	}elseif($key == 'value'){
407	$setting = stripslashes($setting);
408	}
409	+ $returnable .= $key.'="'. esc_attr( $setting ) .'"';
410	}// foreach
411	//close the input
412	$returnable .= ' />';

435	function wpec_taxes_build_select_options( $input_array, $option_value, $option_text, $option_selected=false, $select_settings='' ) {
436	$returnable = '';
437	$options = '';
438	+ if( empty($input_array)) return;
439	foreach ( $input_array as $value ) {
440	//if the selected value exists in the input array skip it and continue processing
441	if ( is_array( $value ) ) {

517	'id' => "band-name-{$key}",
518	'name' => "wpsc_options[wpec_taxes_{$type}][{$key}][name]",
519	'class' => 'taxes-band',
520	+ 'label' => __( 'Name', 'wpsc' )
521	);
522	$bands_hidden_index = array(
523	'type' => 'hidden',

531	'id' => "shipping-{$key}",
532	'name' => "wpsc_options[wpec_taxes_{$type}][{$key}][shipping]",
533	'class' => "taxes-{$type}",
534	+ 'label' => __( 'Apply to Shipping', 'wpsc' )
535	);
536	}// if
537

wpsc-taxes/models/taxes.class.php CHANGED Viewed

	@@ -327,6 +327,7 @@ class wpec_taxes {
327	//database connection
328	global $wpdb;
329

330	//get the id for the given country code
331	$country_id = $this->wpec_taxes_get_country_information( 'id', array( 'isocode' => $country ) );
332


327	//database connection
328	global $wpdb;
329
330	+ if( isset( $country ) && 'all-markets' == $country ) return;
331	//get the id for the given country code
332	$country_id = $this->wpec_taxes_get_country_information( 'id', array( 'isocode' => $country ) );
333

wpsc-taxes/taxes_module.php CHANGED Viewed

	@@ -3,13 +3,15 @@
3	/**
4	* Load required files
5	* */
6	- require_once 'models/taxes.class.php';
7	- require_once 'controllers/taxes_controller.class.php';
8
9	- ~~$version_identifier~~ = ~~WPSC_VERSION . "." . WPSC_MINOR_VERSION;~~
10	-
11	- //include required js file
12	- wp_enqueue_script( 'wp-e-commerce-taxes-functions', WPSC_URL . '/wpsc-taxes/view/js/taxes-functions.js', array( 'wp-e-commerce-admin' ), $version_identifier, false );


13
14	/**
15	* @description: wpec_taxes_settings_page - used by wpec to display the admin settings page.
	@@ -92,6 +94,9 @@ function wpec_submit_taxes_options() {
92	//check the rates
93	if ( isset( $_POST['wpsc_options']['wpec_taxes_' . $taxes_type] ) ) {
94	foreach ( $_POST['wpsc_options']['wpec_taxes_' . $taxes_type] as $tax_rate ) {



95	//if there is no country then skip
96	if ( empty( $tax_rate['country_code'] ) ) {
97	continue;


3	/**
4	* Load required files
5	* */
6	+ require_once WPSC_FILE_PATH.'/wpsc-taxes/models/taxes.class.php';
7	+ require_once WPSC_FILE_PATH.'/wpsc-taxes/controllers/taxes_controller.class.php';
8
9	+ function wpsc_include_taxes_js() {
10	+ $version_identifier = WPSC_VERSION . "." . WPSC_MINOR_VERSION;
11	+ //include required js file
12	+ wp_enqueue_script( 'wp-e-commerce-taxes-functions', WPSC_URL . '/wpsc-taxes/view/js/taxes-functions.js', array( 'wp-e-commerce-admin' ), $version_identifier, false );
13	+ }
14	+ add_action( 'admin_enqueue_scripts', 'wpsc_include_taxes_js' );
15
16	/**
17	* @description: wpec_taxes_settings_page - used by wpec to display the admin settings page.

94	//check the rates
95	if ( isset( $_POST['wpsc_options']['wpec_taxes_' . $taxes_type] ) ) {
96	foreach ( $_POST['wpsc_options']['wpec_taxes_' . $taxes_type] as $tax_rate ) {
97	+ if( !isset( $tax_rate['region_code'] ) )
98	+ $tax_rate['region_code'] = '';
99	+
100	//if there is no country then skip
101	if ( empty( $tax_rate['country_code'] ) ) {
102	continue;

wpsc-theme/functions/wpsc-transaction_results_functions.php CHANGED Viewed

	@@ -54,7 +54,7 @@ function wpsc_transaction_theme() {
54	$cart_log_id = $wpdb->get_var( "SELECT `id` FROM `" . WPSC_TABLE_PURCHASE_LOGS . "` WHERE `sessionid`= " . $sessionid . " LIMIT 1" );
55	return transaction_results( $sessionid, true );
56	}else
57	- _e( 'Sorry your transaction was not accepted.<br /><a href=~~' . get_option(~~ "~~shopping_cart_url~~" ~~) . '~~>Click here to go back to checkout page~~.</~~a>' );
58	}
59
60	}
	@@ -103,11 +103,13 @@ function transaction_results( $sessionid, $display_to_screen = true, $transactio
103	$message = __('The Transaction was successful', 'wpsc')."\r\n".$message;
104	$message_html = __('The Transaction was successful', 'wpsc')."<br />".$message_html;
105	}
106	-


107	if ( !empty($purchase_log['shipping_country']) ) {
108	$billing_country = $purchase_log['billing_country'];
109	$shipping_country = $purchase_log['shipping_country'];
110	- } ~~else~~ {
111	$country = $wpdb->get_var( "SELECT `value` FROM `" . WPSC_TABLE_SUBMITED_FORM_DATA . "` WHERE `log_id`=" . $purchase_log['id'] . " AND `form_id` = '" . get_option( 'country_form_field' ) . "' LIMIT 1" );
112
113	$billing_country = $country;
	@@ -149,7 +151,8 @@ function transaction_results( $sessionid, $display_to_screen = true, $transactio
149	} else {
150	$order_status = $purchase_log['processed'];
151	}
152	- ~~$previous_download_ids[]~~ = $download_data['id'];

153	}
154
155	do_action( 'wpsc_confirm_checkout', $purchase_log['id'] );
	@@ -254,7 +257,7 @@ function transaction_results( $sessionid, $display_to_screen = true, $transactio
254	$total_price_html.= sprintf(__( 'Total: %s
255	', 'wpsc' ), wpsc_currency_display( $total ) );
256	$report_id = sprintf(__("Purchase # %s
257	- "), $purchase_log['id']);
258
259	if ( isset( $_GET['ti'] ) ) {
260	$message.= "\n\r" . __( 'Your Transaction ID', 'wpsc' ) . ": " . $_GET['ti'];


54	$cart_log_id = $wpdb->get_var( "SELECT `id` FROM `" . WPSC_TABLE_PURCHASE_LOGS . "` WHERE `sessionid`= " . $sessionid . " LIMIT 1" );
55	return transaction_results( $sessionid, true );
56	}else
57	+ printf( __( 'Sorry your transaction was not accepted.<br /><a href="%1$s">Click here to go back to checkout page</a>.', 'wpsc' ), get_option( "shopping_cart_url" ) );
58	}
59
60	}

103	$message = __('The Transaction was successful', 'wpsc')."\r\n".$message;
104	$message_html = __('The Transaction was successful', 'wpsc')."<br />".$message_html;
105	}
106	+ $country = get_option( 'country_form_field' );
107	+ $billing_country = '';
108	+ $shipping_country = '';
109	if ( !empty($purchase_log['shipping_country']) ) {
110	$billing_country = $purchase_log['billing_country'];
111	$shipping_country = $purchase_log['shipping_country'];
112	+ } elseif ( !empty($country) ) {
113	$country = $wpdb->get_var( "SELECT `value` FROM `" . WPSC_TABLE_SUBMITED_FORM_DATA . "` WHERE `log_id`=" . $purchase_log['id'] . " AND `form_id` = '" . get_option( 'country_form_field' ) . "' LIMIT 1" );
114
115	$billing_country = $country;

151	} else {
152	$order_status = $purchase_log['processed'];
153	}
154	+ if( isset( $download_data['id'] ) )
155	+ $previous_download_ids[] = $download_data['id'];
156	}
157
158	do_action( 'wpsc_confirm_checkout', $purchase_log['id'] );

257	$total_price_html.= sprintf(__( 'Total: %s
258	', 'wpsc' ), wpsc_currency_display( $total ) );
259	$report_id = sprintf(__("Purchase # %s
260	+ ", 'wpsc'), $purchase_log['id']);
261
262	if ( isset( $_GET['ti'] ) ) {
263	$message.= "\n\r" . __( 'Your Transaction ID', 'wpsc' ) . ": " . $_GET['ti'];

wpsc-theme/functions/wpsc-user_log_functions.php CHANGED Viewed

	@@ -377,11 +377,11 @@ function wpsc_user_details() {
377	echo " </td>\n\r";
378
379	echo " <td>";
380	-
381	if ( $purchase['shipping_country'] != '' ) {
382	$billing_country = $purchase['billing_country'];
383	$shipping_country = $purchase['shipping_country'];
384	- } ~~else~~ {
385	$country_sql = "SELECT * FROM `" . WPSC_TABLE_SUBMITED_FORM_DATA . "` WHERE `log_id` = '" . $purchase['id'] . "' AND `form_id` = '" . get_option( 'country_form_field' ) . "' LIMIT 1";
386	$country_data = $wpdb->get_results( $country_sql, ARRAY_A );
387	$billing_country = $country_data[0]['value'];
	@@ -498,15 +498,10 @@ function wpsc_user_details() {
498	$alternate = "class='alt'";
499
500	$variation_list = '';
501	- ~~/* $purch_data is not set..~~
502	- if ( $purch_data[0]['shipping_country'] != '' ) {
503	- $billing_country = $purch_data[0]['billing_country'];
504	- $shipping_country = $purch_data[0]['shipping_country'];
505	- } else { */
506	$billing_country = !empty($country_data[0]['value']) ? $country_data[0]['value'] : '';
507	$shipping_country = !empty($country_data[0]['value']) ? $country_data[0]['value'] : '';
508	- ~~/}/~~
509	-
510	$shipping = $cart_row['pnp'];
511	$total_shipping += $shipping;
512	echo "<tr $alternate>";
	@@ -553,17 +548,22 @@ function wpsc_user_details() {
553	echo " </td>";
554
555	echo " <td>";


556	echo " </td>";
557
558	echo " <td>";
559	echo "<strong>" . __( 'Total Shipping', 'wpsc' ) . ":</strong><br />";

560	echo "<strong>" . __( 'Final Total', 'wpsc' ) . ":</strong>";
561	echo " </td>";
562
563	echo " <td>";
564	$total_shipping += $purchase['base_shipping'];
565	$endtotal += $total_shipping;

566	echo wpsc_currency_display( $total_shipping, array('display_as_html' => false) ) . "<br />";

567	echo wpsc_currency_display( $endtotal , array('display_as_html' => false) );
568	echo " </td>";
569


377	echo " </td>\n\r";
378
379	echo " <td>";
380	+ $country = get_option( 'country_form_field' );
381	if ( $purchase['shipping_country'] != '' ) {
382	$billing_country = $purchase['billing_country'];
383	$shipping_country = $purchase['shipping_country'];
384	+ } elseif ( !empty($country)) {
385	$country_sql = "SELECT * FROM `" . WPSC_TABLE_SUBMITED_FORM_DATA . "` WHERE `log_id` = '" . $purchase['id'] . "' AND `form_id` = '" . get_option( 'country_form_field' ) . "' LIMIT 1";
386	$country_data = $wpdb->get_results( $country_sql, ARRAY_A );
387	$billing_country = $country_data[0]['value'];

498	$alternate = "class='alt'";
499
500	$variation_list = '';
501	+




502	$billing_country = !empty($country_data[0]['value']) ? $country_data[0]['value'] : '';
503	$shipping_country = !empty($country_data[0]['value']) ? $country_data[0]['value'] : '';
504	+

505	$shipping = $cart_row['pnp'];
506	$total_shipping += $shipping;
507	echo "<tr $alternate>";

548	echo " </td>";
549
550	echo " <td>";
551	+ echo " <td>";
552	+ echo " </td>";
553	echo " </td>";
554
555	echo " <td>";
556	echo "<strong>" . __( 'Total Shipping', 'wpsc' ) . ":</strong><br />";
557	+ echo "<strong>" . __( 'Total Tax', 'wpsc' ) . ":</strong><br />";
558	echo "<strong>" . __( 'Final Total', 'wpsc' ) . ":</strong>";
559	echo " </td>";
560
561	echo " <td>";
562	$total_shipping += $purchase['base_shipping'];
563	$endtotal += $total_shipping;
564	+ $endtotal += $purchase['wpec_taxes_total'];
565	echo wpsc_currency_display( $total_shipping, array('display_as_html' => false) ) . "<br />";
566	+ echo wpsc_currency_display( $purchase['wpec_taxes_total'] , array('display_as_html' => false) ). "<br />";
567	echo wpsc_currency_display( $endtotal , array('display_as_html' => false) );
568	echo " </td>";
569

wpsc-theme/wpsc-cart_widget.php CHANGED Viewed

	@@ -61,10 +61,10 @@
61	<?php endif; ?>
62	<tr>
63	<td id='cart-widget-links' colspan="5">
64	- <a target="_parent" href="<?php echo get_option('shopping_cart_url'); ?>" title="Checkout" class="gocheckout"><?php _e('Checkout', 'wpsc'); ?></a>
65	<form action="" method="post" class="wpsc_empty_the_cart">
66	<input type="hidden" name="wpsc_ajax_action" value="empty_cart" />
67	- <a target="_parent" href="<?php echo htmlentities(add_query_arg('wpsc_ajax_action', 'empty_cart', remove_query_arg('ajax')), ENT_QUOTES, 'UTF-8'); ?>" class="emptycart" title="Empty Your Cart"><?php _e('Clear cart', 'wpsc'); ?></a>
68	</form>
69	</td>
70	</tr>
	@@ -74,7 +74,7 @@
74	<?php else: ?>
75	<p class="empty">
76	<?php _e('Your shopping cart is empty', 'wpsc'); ?><br />
77	- <a target="_parent" href="<?php echo get_option('product_list_url'); ?>" class="visitshop" title="Visit Shop"><?php _e('Visit the shop', 'wpsc'); ?></a>
78	</p>
79	<?php endif; ?>
80


61	<?php endif; ?>
62	<tr>
63	<td id='cart-widget-links' colspan="5">
64	+ <a target="_parent" href="<?php echo get_option('shopping_cart_url'); ?>" title="<?php _e('Checkout', 'wpsc'); ?>" class="gocheckout"><?php _e('Checkout', 'wpsc'); ?></a>
65	<form action="" method="post" class="wpsc_empty_the_cart">
66	<input type="hidden" name="wpsc_ajax_action" value="empty_cart" />
67	+ <a target="_parent" href="<?php echo htmlentities(add_query_arg('wpsc_ajax_action', 'empty_cart', remove_query_arg('ajax')), ENT_QUOTES, 'UTF-8'); ?>" class="emptycart" title="<?php _e('Empty Your Cart', 'wpsc'); ?>"><?php _e('Clear cart', 'wpsc'); ?></a>
68	</form>
69	</td>
70	</tr>

74	<?php else: ?>
75	<p class="empty">
76	<?php _e('Your shopping cart is empty', 'wpsc'); ?><br />
77	+ <a target="_parent" href="<?php echo get_option('product_list_url'); ?>" class="visitshop" title="<?php _e('Visit Shop', 'wpsc'); ?>"><?php _e('Visit the shop', 'wpsc'); ?></a>
78	</p>
79	<?php endif; ?>
80

wpsc-theme/wpsc-category_widget.php CHANGED Viewed

	@@ -24,7 +24,7 @@
24
25	<?php else : ?>
26	<div class="wpsc_categorisation_group" id="categorisation_group_<?php echo $category_id; ?>">
27	- <ul class="wpsc_categories wpsc_top_level_categories ~~<?php echo implode( ' ', (array)$provided_classes ); ?>~~">
28	<li class="wpsc_category_<?php echo $curr_cat['term_id']; wpsc_print_category_classes($curr_cat); ?>">
29	<?php if(! ($category_image == WPSC_CATEGORY_URL) ){ ?>
30	<a href="<?php echo $link; ?>" class="wpsc_category_image_link"><?php
	@@ -33,7 +33,7 @@
33
34	<a href="<?php echo $link; ?>"><?php echo $curr_cat['name']; ?></a>
35
36	- <ul class="wpsc_categories wpsc_second_level_categories ~~<?php echo implode( ' ', (array)$provided_classes ); ?>~~">
37
38	<?php wpsc_start_category_query( array( 'parent_category_id' => $category_id, 'show_thumbnails' => $show_thumbnails , 'show_name' => $show_name) ); ?>
39


24
25	<?php else : ?>
26	<div class="wpsc_categorisation_group" id="categorisation_group_<?php echo $category_id; ?>">
27	+ <ul class="wpsc_categories wpsc_top_level_categories">
28	<li class="wpsc_category_<?php echo $curr_cat['term_id']; wpsc_print_category_classes($curr_cat); ?>">
29	<?php if(! ($category_image == WPSC_CATEGORY_URL) ){ ?>
30	<a href="<?php echo $link; ?>" class="wpsc_category_image_link"><?php

33
34	<a href="<?php echo $link; ?>"><?php echo $curr_cat['name']; ?></a>
35
36	+ <ul class="wpsc_categories wpsc_second_level_categories">
37
38	<?php wpsc_start_category_query( array( 'parent_category_id' => $category_id, 'show_thumbnails' => $show_thumbnails , 'show_name' => $show_name) ); ?>
39

wpsc-theme/wpsc-default.css CHANGED Viewed

@@ -320,7 +320,6 @@ Author URI: http://instinct.co.nz
             #list_view_products_page_container {
             /* 	width:650px;	 */
             	position:relative;
-            -
            	line-height:1.2em;
+            }
             #list_view_products_page_container .wpsc_page_numbers_top {
@@ -331,86 +330,22 @@ Author URI: http://instinct.co.nz
             	margin-top:10px;
+            }
-            -
            #list_view_products_page_container .wpsc_page_numbers_top a:link, #list_view_products_page_container .wpsc_page_numbers_top a:visited, #list_view_products_page_container .wpsc_page_numbers_bottom a:link, #list_view_products_page_container .wpsc_page_numbers_bottom a:visited {
-            -
            	padding:5px 8px;
-            -
            	background-color:#006699;
-            -
            	background:-webkit-gradient(
-            -
                linear,
-            -
                left bottom,
-            -
                left top,
-            -
                color-stop(0.76, rgb(73,166,192)),
-            -
                color-stop(1, rgb(125,195,215))
-            -
            	);
-            -
            	background:-moz-linear-gradient(
-            -
                center bottom,
-            -
                rgb(73,166,192) 76%,
-            -
                rgb(125,195,215) 100%
-            -
            	);
-            -
            	margin-right:5px;
-            -
            	color:#ffffff;
-            -
            	font-size:12px;
-            -
            	border-radius:3px;
-            -
            	-moz-border-radius:3px;
-            -
            	-webkit-border-radius:3px;
-            -
            	text-decoration:none;
-            -
            	*display:inline-block;
-            -
            }
-            -
-            -
            #list_view_products_page_container .wpsc_page_numbers_top a:hover, #list_view_products_page_container .wpsc_page_numbers_top a:active, #list_view_products_page_container .wpsc_page_numbers_bottom a:hover, #list_view_products_page_container .wpsc_page_numbers_bottom a:active {
-            -
            	background:#49a6c0;
-            -
            }
-            -
-            -
            #list_view_products_page_container .wpsc_page_numbers_top span.current, #list_view_products_page_container .wpsc_page_numbers_top span.current, #list_view_products_page_container .wpsc_page_numbers_bottom span.current, #list_view_products_page_container .wpsc_page_numbers_bottom span.current {
-            -
            	padding:5px 8px;
-            -
            	background-color:#999;
-            -
            	color:#ffffff;
-            -
            	font-size:12px;
-            -
            	border-radius:3px;
-            -
            	-moz-border-radius:3px;
-            -
            	-webkit-border-radius:3px;
-            -
            	*display:inline-block;
-            -
            	margin-right:5px;
-            -
            }
-            -
             #list_view_products_page_container p, #content #list_view_products_page_container p {
             	line-height:1.2em;
-            -
            	font-size:13px;
             	margin:0;
             	padding:0;
+            }
             #list_view_products_page_container span.sale {
-            -
            	background:url(wpsc-images/sale.png) no-repeat scroll 0 0 transparent;
-            -
            	position:absolute;
-            -
            	top:-3px;
-            -
            	left:-14px;
-            -
            	text-indent:-9999px;
-            -
            	display:block;
-            -
            	width:40px;
-            -
            	height:40px;
+            }
             #list_view_products_page_container input, #content #list_view_products_page_container input, #list_view_products_page_container textarea, #content #list_view_products_page_container textarea {
-            -
            	line-height:1.2em;
             	margin:0;
             	padding:0;
+            }
-            -
            table.list_productdisplay, #content table.list_productdisplay {
-            -
            	border-collapse:collapse;
-            -
            	border:none;
-            -
            	padding:0;
-            -
            	margin:0 0 10px 0;
-            -
            	width:100%;
-            -
            }
-            -
-            -
            table.list_productdisplay td, #content table.list_productdisplay td {
-            -
            	border:1px dashed #ccc;
-            -
            	padding:5px;
-            -
            	vertical-align:middle;
-            -
            }
-            -
             table.list_productdisplay form.product_form {
             	display:inline;
+            }
@@ -447,7 +382,6 @@ table.list_productdisplay .wpsc_buy_button_container .wpsc_loading_animation img
             table.list_productdisplay .oldprice {
             	text-decoration:line-through;
-            -
            	color:#666;
+            }
             #list_view_products_page_container table.list_productdisplay input.wpsc_buy_button, #content #list_view_products_page_container table.list_productdisplay input.wpsc_buy_button {

             #list_view_products_page_container {
             /* 	width:650px;	 */
             	position:relative;
+            }
             #list_view_products_page_container .wpsc_page_numbers_top {
             	margin-top:10px;
+            }
             #list_view_products_page_container p, #content #list_view_products_page_container p {
             	line-height:1.2em;
             	margin:0;
             	padding:0;
+            }
             #list_view_products_page_container span.sale {
+            +
            	display:none;
+            }
             #list_view_products_page_container input, #content #list_view_products_page_container input, #list_view_products_page_container textarea, #content #list_view_products_page_container textarea {
             	margin:0;
             	padding:0;
+            }
             table.list_productdisplay form.product_form {
             	display:inline;
+            }
             table.list_productdisplay .oldprice {
             	text-decoration:line-through;
+            }
             #list_view_products_page_container table.list_productdisplay input.wpsc_buy_button, #content #list_view_products_page_container table.list_productdisplay input.wpsc_buy_button {

wpsc-theme/wpsc-shopping_cart_page.php CHANGED Viewed

	@@ -85,7 +85,7 @@ endif;
85	<tr class="wpsc_coupon_row wpsc_coupon_error_row"><td><?php _e('Coupon is not valid.', 'wpsc'); ?></td></tr>
86	<?php endif; ?>
87	<tr class="wpsc_coupon_row">
88	- <td colspan="2"><?php _e('Enter coupon code'); ?> :</td>
89	<td colspan="4" class="coupon_code">
90	<form method="post" action="<?php echo get_option('shopping_cart_url'); ?>">
91	<input type="text" name="coupon_num" id="coupon_num" value="<?php echo $wpsc_cart->coupons_name; ?>" />
	@@ -218,17 +218,17 @@ endif;
218	<?php endif; ?>
219
220	<?php if ( wpsc_show_user_login_form() && !is_user_logged_in() ): ?>
221	- <p><?php _e('You must sign in or register with us to continue with your purchase');?></p>
222	<div class="wpsc_registration_form">
223
224	<fieldset class='wpsc_registration_form'>
225	- <h2><?php _e( 'Sign in' ); ?></h2>
226
227	<?php
228	$args = array( 'remember' => false );
229	wp_login_form( $args );
230	?>
231	- <div class="wpsc_signup_text"><?php _e('If you have bought from us before please sign in here to purchase');?></div>
232	</fieldset>
233	</div>
234	<?php endif; ?>
	@@ -247,18 +247,18 @@ endif;
247	<div class="wpsc_registration_form">
248
249	<fieldset class='wpsc_registration_form wpsc_right_registration'>
250	- <h2><?php _e('Join up now');?></h2>
251
252	- <label><?php _e('Username'); ?>:</label>
253	<input type="text" name="log" id="log" value="" size="20"/><br/>
254
255	- <label><?php _e('Password'); ?>:</label>
256	<input type="password" name="pwd" id="pwd" value="" size="20" /><br />
257
258	- <label><?php _e('E-mail'); ?>:</label>
259	<input type="text" name="user_email" id="user_email" value="<?php echo attribute_escape(stripslashes($user_email)); ?>" size="20" /><br />
260
261	- <div class="wpsc_signup_text"><?php _e('Signing up is free and easy! please fill out your details your registration will happen automatically as you checkout. Don\'t forget to use your details to login with next time!');?></div>
262	</fieldset>
263
264	</div>
	@@ -441,9 +441,7 @@ endif;
441	<?php if(wpsc_has_tnc()) : ?>
442	<tr>
443	<td colspan='2'>
444	- <input type='checkbox' value='yes' name='agree' /> <?php _e('I agree to The ', 'wpsc')~~;?>~~
445	- <a class='thickbox' target='_blank' href='<?php
446	- echo site_url("?termsandconds=true&width=360&height=400'"); ?>' class='termsandconds'> <?php _e('Terms and Conditions', 'wpsc');?></a>
447	</td>
448	</tr>
449	<?php endif; ?>
	@@ -459,7 +457,7 @@ endif;
459
460	<tr class="total_price total_shipping">
461	<td class='wpsc_totals'>
462	- <?php _e('Total Shipping', 'wpsc'); ?>
463	</td>
464	<td class='wpsc_totals'>
465	<span id="checkout_shipping" class="pricedisplay checkout-shipping"><?php echo wpsc_cart_shipping(); ?></span>
	@@ -470,7 +468,7 @@ endif;
470	<?php if(wpsc_uses_coupons() && (wpsc_coupon_amount(false) > 0)): ?>
471	<tr class="total_price">
472	<td class='wpsc_totals'>
473	- <?php _e('Discount', 'wpsc'); ?>
474	</td>
475	<td class='wpsc_totals'>
476	<span id="coupons_amount" class="pricedisplay"><?php echo wpsc_coupon_amount(); ?></span>


85	<tr class="wpsc_coupon_row wpsc_coupon_error_row"><td><?php _e('Coupon is not valid.', 'wpsc'); ?></td></tr>
86	<?php endif; ?>
87	<tr class="wpsc_coupon_row">
88	+ <td colspan="2"><?php _e('Enter coupon code', 'wpsc'); ?> :</td>
89	<td colspan="4" class="coupon_code">
90	<form method="post" action="<?php echo get_option('shopping_cart_url'); ?>">
91	<input type="text" name="coupon_num" id="coupon_num" value="<?php echo $wpsc_cart->coupons_name; ?>" />

218	<?php endif; ?>
219
220	<?php if ( wpsc_show_user_login_form() && !is_user_logged_in() ): ?>
221	+ <p><?php _e('You must sign in or register with us to continue with your purchase', 'wpsc');?></p>
222	<div class="wpsc_registration_form">
223
224	<fieldset class='wpsc_registration_form'>
225	+ <h2><?php _e( 'Sign in', 'wpsc' ); ?></h2>
226
227	<?php
228	$args = array( 'remember' => false );
229	wp_login_form( $args );
230	?>
231	+ <div class="wpsc_signup_text"><?php _e('If you have bought from us before please sign in here to purchase', 'wpsc');?></div>
232	</fieldset>
233	</div>
234	<?php endif; ?>

247	<div class="wpsc_registration_form">
248
249	<fieldset class='wpsc_registration_form wpsc_right_registration'>
250	+ <h2><?php _e('Join up now', 'wpsc');?></h2>
251
252	+ <label><?php _e('Username', 'wpsc'); ?>:</label>
253	<input type="text" name="log" id="log" value="" size="20"/><br/>
254
255	+ <label><?php _e('Password', 'wpsc'); ?>:</label>
256	<input type="password" name="pwd" id="pwd" value="" size="20" /><br />
257
258	+ <label><?php _e('E-mail', 'wpsc'); ?>:</label>
259	<input type="text" name="user_email" id="user_email" value="<?php echo attribute_escape(stripslashes($user_email)); ?>" size="20" /><br />
260
261	+ <div class="wpsc_signup_text"><?php _e('Signing up is free and easy! please fill out your details your registration will happen automatically as you checkout. Don\'t forget to use your details to login with next time!', 'wpsc');?></div>
262	</fieldset>
263
264	</div>

441	<?php if(wpsc_has_tnc()) : ?>
442	<tr>
443	<td colspan='2'>
444	+ <label for="agree"><input id="agree" type='checkbox' value='yes' name='agree' /> <?php printf(__("I agree to The <a class='thickbox' target='_blank' href='%s' class='termsandconds'>Terms and Conditions</a>", "wpsc"), site_url("?termsandconds=true&width=360&height=400'")); ?></label>


445	</td>
446	</tr>
447	<?php endif; ?>

457
458	<tr class="total_price total_shipping">
459	<td class='wpsc_totals'>
460	+ <?php _e('Total Shipping', 'wpsc'); ?>:
461	</td>
462	<td class='wpsc_totals'>
463	<span id="checkout_shipping" class="pricedisplay checkout-shipping"><?php echo wpsc_cart_shipping(); ?></span>

468	<?php if(wpsc_uses_coupons() && (wpsc_coupon_amount(false) > 0)): ?>
469	<tr class="total_price">
470	<td class='wpsc_totals'>
471	+ <?php _e('Discount', 'wpsc'); ?>:
472	</td>
473	<td class='wpsc_totals'>
474	<span id="coupons_amount" class="pricedisplay"><?php echo wpsc_coupon_amount(); ?></span>

wpsc-theme/wpsc-user-log.php CHANGED Viewed

	@@ -158,7 +158,7 @@ global $files, $separator, $purchase_log, $col_count, $products, $links; ?>
158	</p>
159
160	<p class="submit">
161	- <input type="submit" name="submit" id="submit" value="Login »" tabindex="4" />
162	<input type="hidden" name="redirect_to" value="<?php echo get_option( 'user_account_url' ); ?>" />
163	</p>
164	</form>


158	</p>
159
160	<p class="submit">
161	+ <input type="submit" name="submit" id="submit" value="<?php _e( 'Login »', 'wpsc' ); ?>" tabindex="4" />
162	<input type="hidden" name="redirect_to" value="<?php echo get_option( 'user_account_url' ); ?>" />
163	</p>
164	</form>

wpsc-updates/currency_list.php CHANGED Viewed

@@ -1,242 +1,242 @@
             <?php
-            -
            $currency_sql="INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (1, '" . __('Mauritania') ."', 'MR', '" . __('Mauritanian Ouguiya') ."', '', '', '" . __('MRO', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (2, '" . __('Martinique (French)') ."', 'MQ', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (3, '" . __('Malta') ."', 'MT', '" . __('Maltese Lira') ."', '', '', '" . __('MTL', 'wpsc') . "', '0', '0' ,'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (4, '" . __('Marshall Islands') ."', 'MH', '" . __('US Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0' ,'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (5, '" . __('Mali') ."', 'ML', '" . __('CFA Franc BCEAO') ."', '', '', '" . __('XOF', 'wpsc') . "', '0', '0' ,'africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (6, '" . __('Maldives') ."', 'MV', '" . __('Maldive Rufiyaa') ."', '', '', '" . __('MVR', 'wpsc') . "', '0', '0' , 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (7, '" . __('Malaysia') ."', 'MY', '" . __('Malaysian Ringgit') ."', '', '', '" . __('MYR', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (8, '" . __('Malawi') ."', 'MW', '" . __('Malawi Kwacha') ."', '', '', '" . __('MWK', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (9, '" . __('Madagascar') ."', 'MG', '" . __('Malagasy Franc') ."', '', '', '" . __('MGF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (10, '" . __('Macau') ."', 'MO', '" . __('Macau Pataca') ."', '', '', '" . __('MOP', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (11, '" . __('Macedonia') ."', 'MK', '" . __('Denar') ."', '', '', '" . __('MKD', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (12, '" . __('Luxembourg') ."', 'LU', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (13, '" . __('Lithuania') ."', 'LT', '" . __('Lithuanian Litas') ."', '', '', '" . __('LTL', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (14, '" . __('Liechtenstein') ."', 'LI', '" . __('Swiss Franc') ."', '', '', '" . __('CHF', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (15, '" . __('Libya') ."', 'LY', '" . __('Libyan Dinar') ."', '', '', '" . __('LYD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (16, '" . __('Liberia') ."', 'LR', '" . __('Liberian Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('LRD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (17, '" . __('Lesotho') ."', 'LS', '" . __('Lesotho Loti') ."', '', '', '" . __('LSL', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (18, '" . __('Lebanon') ."', 'LB', '" . __('Lebanese Pound') ."', '', '', '" . __('LBP', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (19, '" . __('Latvia') ."', 'LV', '" . __('Latvian Lats') ."', '', '', '" . __('LVL', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (20, '" . __('Laos') ."', 'LA', '" . __('Lao Kip') ."', '', '', '" . __('LAK', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (21, '" . __('Kyrgyzstan') ."', 'KG', '" . __('Som') ."', '', '', '" . __('KGS', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (22, '" . __('Kuwait') ."', 'KW', '" . __('Kuwaiti Dinar') ."', '', '', '" . __('KWD', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (23, '" . __('Korea, South') ."', 'KR', '" . __('Korean Won') ."', '', '', '" . __('KRW', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (24, '" . __('Korea, North') ."', 'KP', '" . __('North Korean Won') ."', '', '', '" . __('KPW', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (25, '" . __('Kiribati') ."', 'KI', '" . __('Australian Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (26, '" . __('Kenya') ."', 'KE', '" . __('Kenyan Shilling') ."', '', '', '" . __('KES', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (27, '" . __('Kazakhstan') ."', 'KZ', '" . __('Kazakhstan Tenge') ."', '', '', '" . __('KZT', 'wpsc') . "', '0', '0' ,'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (28, '" . __('Jordan') ."', 'JO', '" . __('Jordanian Dinar') ."', '', '', '" . __('JOD', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (29, '" . __('Jersey') ."', 'JE', '" . __('Pound Sterling') ."', '" . __('£', 'wpsc') . "', '" . __('&#163;', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (30, '" . __('Japan') ."', 'JP', '" . __('Japanese Yen') ."', '" . __('¥', 'wpsc') . "', '" . __('&#165;', 'wpsc') . "', '" . __('JPY', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (31, '" . __('Jamaica') ."', 'JM', '" . __('Jamaican Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('JMD', 'wpsc') . "', '0', '0' ,'southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (32, '" . __('Ivory Coast') ."', 'CI', '" . __('CFA Franc BCEAO') ."', '', '', '" . __('XOF', 'wpsc') . "', '0', '0' ,'africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (33, '" . __('Italy') ."', 'IT', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (34, '" . __('Isle of Man') ."', 'IM', '" . __('Pound Sterling') ."', '" . __('£', 'wpsc') . "', '" . __('&#163;', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (35, '" . __('Israel') ."', 'IL', '" . __('Israeli New Shekel') ."', '', '', '" . __('ILS', 'wpsc') . "', '0', '0',  'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (36, '" . __('Ireland') ."', 'IE', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (37, '" . __('Iraq') ."', 'IQ', '" . __('Iraqi Dinar') ."', '', '', '" . __('IQD', 'wpsc') . "', '0', '0',  'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (38, '" . __('Indonesia') ."', 'ID', '" . __('Indonesian Rupiah') ."', '', '', '" . __('IDR', 'wpsc') . "', '0', '0',  'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (39, '" . __('Iran') ."', 'IR', '" . __('Iranian Rial') ."', '', '', '" . __('IRR', 'wpsc') . "', '0', '0',  'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (40, '" . __('India') ."', 'IN', '" . __('Indian Rupee') ."', '', '', '" . __('INR', 'wpsc') . "', '0', '0',  'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (41, '" . __('Iceland') ."', 'IS', '" . __('Iceland Krona') ."', '', '', '" . __('ISK', 'wpsc') . "', '0', '0', 'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (42, '" . __('Hungary') ."', 'HU', '" . __('Hungarian Forint') ."', '', '', '" . __('HUF', 'wpsc') . "', '0', '0', 'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (43, '" . __('Hong Kong') ."', 'HK', '" . __('Hong Kong Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('HKD', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (44, '" . __('Honduras') ."', 'HN', '" . __('Honduran Lempira') ."', '', '', '" . __('HNL', 'wpsc') . "', '0', '0' , 'southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (45, '" . __('Heard Island and McDonald Islands') ."', 'HM', '" . __('Australian Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (46, '" . __('Haiti') ."', 'HT', '" . __('Haitian Gourde') ."', '', '', '" . __('HTG', 'wpsc') . "', '0', '0', 'southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (47, '" . __('Guyana') ."', 'GY', '" . __('Guyana Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('GYD', 'wpsc') . "', '0', '0', 'southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (48, '" . __('Guinea Bissau') ."', 'GW', '" . __('Guinea-Bissau Peso') ."', '', '', '" . __('GWP', 'wpsc') . "', '0', '0' ,'africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (49, '" . __('Guinea') ."', 'GN', '" . __('Guinea Franc') ."', '', '', '" . __('GNF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (50, '" . __('Guernsey') ."', 'GF', '" . __('Pound Sterling') ."', '" . __('£', 'wpsc') . "', '" . __('&#163;', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0' ,'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (51, '" . __('Guatemala') ."', 'GT', '" . __('Guatemalan Quetzal') ."', '', '', '" . __('QTQ', 'wpsc') . "', '0', '0', 'southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (52, '" . __('Guam (USA)') ."', 'GU', '" . __('US Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (53, '" . __('Grenada') ."', 'GD', '" . __('East Carribean Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (54, '" . __('Guadeloupe (French)') ."', 'GP', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0', 'southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (55, '" . __('Greenland') ."', 'GL', '" . __('Danish Krone') ."', '', '', '" . __('DKK', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (56, '" . __('Greece') ."', 'GR', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '19','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (57, '" . __('Gibraltar') ."', 'GI', '" . __('Gibraltar Pound') ."', '', '', '" . __('GIP', 'wpsc') . "', '0', '0', 'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (58, '" . __('Ghana') ."', 'GH', '" . __('Ghanaian Cedi') ."', '', '', '" . __('GHC', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (59, '" . __('Germany') ."', 'DE', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (60, '" . __('Georgia') ."', 'GE', '" . __('Georgian Lari') ."', '', '', '" . __('GEL', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (61, '" . __('Gambia') ."', 'GM', '" . __('Gambian Dalasi') ."', '', '', '" . __('GMD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (62, '" . __('Gabon') ."', 'GA', '" . __('CFA Franc BEAC') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (63, '" . __('French Southern Territories') ."', 'TF', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (64, '" . __('France') ."', 'FR', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0', 'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (65, '" . __('Finland') ."', 'FI', '" . __('Euro') ."', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0', 'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (66, '" . __('Fiji') ."', 'FJ', '" . __('Fiji Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('FJD', 'wpsc') . "', '0', '0', 'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (67, '" . __('Faroe Islands') ."', 'FO', '" . __('Danish Krone') ."', '', '', '" . __('DKK', 'wpsc') . "', '0', '0' ,'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (68, '" . __('Falkland Islands') ."', 'FK', '" . __('Falkland Islands Pound') ."', '', '', '" . __('FKP', 'wpsc') . "', '0', '0' ,'southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (69, '" . __('Ethiopia') ."', 'ET', '" . __('Ethiopian Birr') ."', '', '', '" . __('ETB', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (70, '" . __('Estonia') ."', 'EE', '" . __('Estonian Kroon') ."', '', '', '" . __('EEK', 'wpsc') . "', '0', '0', 'europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (71, '" . __('Eritrea') ."', 'ER', '" . __('Eritrean Nakfa') ."', '', '', '" . __('ERN', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (72, '" . __('Equatorial Guinea') ."', 'GQ', '" . __('CFA Franc BEAC') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (73, '" . __('El Salvador') ."', 'SV', '" . __('El Salvador Colon') ."', '', '', '" . __('SVC', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (74, '" . __('Egypt') ."', 'EG', '" . __('Egyptian Pound') ."', '', '', '" . __('EGP', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (75, '" . __('Ecuador') ."', 'EC', '" . __('Ecuador Sucre') ."', '', '', '" . __('ECS', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (76, '" . __('East Timor') ."', 'TP', '" . __('Timor Escudo') ."', '', '', '" . __('TPE', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (77, '" . __('Dominican Republic') ."', 'DO', '" . __('Dominican Peso') ."', '', '', '" . __('DOP', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (78, '" . __('Dominica') ."', 'DM', '" . __('East Caribbean Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (79, '" . __('Djibouti') ."', 'DJ', '" . __('Djibouti Franc') ."', '', '', '" . __('DJF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (80, '" . __('Denmark') ."', 'DK', '" . __('Danish Krone') ."', '', '', '" . __('DKK', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (81, '" . __('Democratic Republic of Congo') ."', 'CD', '" . __('Francs') ."', '', '', '" . __('CDF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (82, '" . __('Czech Rep.') ."', 'CZ', '" . __('Czech Koruna') ."', '', '', '" . __('CZK', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (83, '" . __('Cyprus') ."', 'CY', '" . __('Cyprus Pound') ."', '', '', '" . __('CYP', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (84, '" . __('Cuba') ."', 'CU', '" . __('Cuban Peso') ."', '', '', '" . __('CUP', 'wpsc') . "', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (85, '" . __('Croatia') ."', 'HR', '" . __('Croatian Kuna') ."', '', '', '" . __('HRK', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (86, '" . __('Costa Rica') ."', 'CR', '" . __('Costa Rican Colon') ."', '', '', '" . __('CRC', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (87, '" . __('Cook Islands') ."', 'CK', '" . __('New Zealand Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('NZD', 'wpsc') . "', '0', '0' ,'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (88, '" . __('Congo') ."', 'CG', '" . __('CFA Franc BEAC') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (89, '" . __('Comoros') ."', 'KM', '" . __('Comoros Franc') ."', '', '', '" . __('KMF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (90, '" . __('Colombia') ."', 'CO', '" . __('Colombian Peso') ."', '', '', '" . __('COP', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (91, '" . __('Cocos (Keeling) Islands') ."', 'CC', '" . __('Australian Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', 'AUD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (92, '" . __('Christmas Island') ."', 'CX', '" . __('Australian Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (93, '" . __('Chile') ."', 'CL', '" . __('Chilean Peso') ."', '', '', '" . __('CLP', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (94, '" . __('China') ."', 'CN', '" . __('Yuan Renminbi') ."', '', '', '" . __('CNY', 'wpsc') . "', '0', '0' ,'asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (95, '" . __('Chad') ."', 'TD', '" . __('CFA Franc BEAC') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (96, '" . __('Central African Republic') ."', 'CF', '" . __('CFA Franc BEAC') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (97, '" . __('Cayman Islands') ."', 'KY', '" . __('Cayman Islands Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('KYD', 'wpsc') . "', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (98, '" . __('Cape Verde') ."', 'CV', '" . __('Cape Verde Escudo') ."', '', '', '" . __('CVE', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (99, '" . __('Cameroon') ."', 'CM', '" . __('CFA Franc BEAC') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (100, '" . __('Canada') ."', 'CA', '" . __('Canadian Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('CAD', 'wpsc') . "', '1', '','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (101, '" . __('Cambodia') ."', 'KH', '" . __('Kampuchean Riel') ."', '', '', '" . __('KHR', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (102, '" . __('Burundi') ."', 'BI', '" . __('Burundi Franc') ."', '', '', '" . __('BIF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (103, '" . __('Burkina Faso') ."', 'BF', '" . __('CFA Franc BCEAO') ."', '', '', '" . __('XOF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (104, '" . __('Bulgaria') ."', 'BG', '" . __('Bulgarian Lev') ."', '', '', '" . __('BGL', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (105, '" . __('Brunei Darussalam') ."', 'BN', '" . __('Brunei Dollar') ."', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', " . __('BND', 'wpsc') . ", '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (106, '" . __('British Indian Ocean Territory') ."', 'IO', '" . __('US Dollar') ."', '$', '&#036;', 'USD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (107, '" . __('Brazil') ."', 'BR', '" . __('Brazilian Real') ."', '', '', '" . __('BRL', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (108, '" . __('Bouvet Island') ."', 'BV', '" . __('Norwegian Krone') ."', '', '', '" . __('NOK', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (109, '" . __('Botswana') ."', 'BW', '" . __('Botswana Pula') ."', '', '', '" . __('BWP', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (110, '" . __('Bosnia-Herzegovina') ."', 'BA', '" . __('Marka') ."', '', '', '" . __('BAM', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (111, '" . __('Bolivia') ."', 'BO', '" . __('Boliviano') . "', '', '', '" . __('BOB', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (112, '" . __('Bhutan') ."', 'BT', '" . __('Bhutan Ngultrum') . "', '', '', '" . __('BTN', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (113, '" . __('Bermuda') ."', 'BM', '" . __('Bermudian Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('BMD', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (114, '" . __('Benin') ."', 'BJ', '" . __('CFA Franc BCEAO') . "', '', '', '" . __('XOF', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (115, '" . __('Belize') ."', 'BZ', '" . __('Belize Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('BZD', 'wpsc') . "', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (116, '" . __('Belgium') ."', 'BE', '" . __('Euro') . "', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (117, '" . __('Belarus') ."', 'BY', '" . __('Belarussian Ruble') . "', '', '', '" . __('BYB', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (118, '" . __('Barbados') ."', 'BB', '" . __('Barbados Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('BBD', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (119, '" . __('Bangladesh') ."', 'BD', '" . __('Bangladeshi Taka') . "', '', '', '" . __('BDT', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (120, '" . __('Bahrain') ."', 'BH', '" . __('Bahraini Dinar') . "', '', '', '" . __('BHD', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (121, '" . __('Bahamas') ."', 'BS', '" . __('Bahamian Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('BSD', 'wpsc') . "', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (122, '" . __('Azerbaijan') ."', 'AZ', '" . __('Azerbaijanian Manat') . "', '', '', '" . __('AZM', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (123, '" . __('Austria') ."', 'AT', '" . __('Euro') . "', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (124, '" . __('Aruba') ."', 'AW', '" . __('Aruban Guilder') . "', '', '', '" . __('AWG', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (125, '" . __('Armenia') ."', 'AM', '" . __('Armenian Dram') . "', '', '', '" . __('AMD', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (126, '" . __('Argentina') ."', 'AR', '" . __('Argentine Peso') . "', '', '', '" . __('ARS', 'wpsc') . "', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (127, '" . __('Antigua and Barbuda') ."', 'AG', '" . __('East Caribbean Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (128, '" . __('Antarctica') ."', 'AQ', '" . __('Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('ATA', 'wpsc') . "', '0', '0','antarctica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (129, '" . __('Anguilla') ."', 'AI', '" . __('East Caribbean Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (130, '" . __('Angola') ."', 'AO', '" . __('Angolan New Kwanza') . "', '', '', '" . __('AON', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (131, '" . __('Andorra') ."', 'AD', '" . __('Euro') . "', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (132, '" . __('American Samoa') ."', 'AS', '" . __('US Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (133, '" . __('Algeria') ."', 'DZ', '" . __('Algerian Dinar') . "', '', '', '" . __('DZD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (134, '" . __('Albania') ."', 'AL', '" . __('Albanian Lek') . "', '', '', '" . __('ALL', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (135, '" . __('Afghanistan') ."', 'AF', '" . __('Afghanistan Afghani') . "', '', '', '" . __('AFA', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (136, '" . __('USA') ."', 'US', '" . __('US Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '1', '','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (137, '" . __('Australia') ."', 'AU', '" . __('Australian Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (138, '" . __('Great Britain') ."', 'GB', '" . __('Pound Sterling') . "', '" . __('£', 'wpsc') . "', '" . __('&#163;', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (139, '" . __('Mauritius') ."', 'MU', '" . __('Mauritius Rupee') . "', '', '', '" . __('MUR', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (140, '" . __('Mayotte') ."', 'YT', '" . __('Euro') . "', '" . __('€', 'wpsc') . "', '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (141, '" . __('Mexico') ."', 'MX', '" . __('Mexican Nuevo Peso') . "', '', '', '" . __('MXN', 'wpsc') . "', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (142, '" . __('Micronesia') ."', 'FM', '" . __('US Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (143, '" . __('Moldova') ."', 'MD', '" . __('Moldovan Leu') . "', '', '', '" . __('MDL', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (144, '" . __('Monaco') ."', 'MC', '" . __('Euro') . "', " . __('€', 'wpsc') . ", '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (145, '" . __('Mongolia') ."', 'MN', '" . __('Mongolian Tugrik') . "', '', '', '" . __('MNT', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (146, '" . __('Montserrat') ."', 'MS', '" . __('East Caribbean Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (147, '" . __('Morocco') ."', 'MA', '" . __('Moroccan Dirham') . "', '', '', '" . __('MAD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (148, '" . __('Mozambique') ."', 'MZ', '" . __('Mozambique Metical') . "', '', '', '" . __('MZM', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (149, '" . __('Myanmar') ."', 'MM', '" . __('Myanmar Kyat') . "', '', '', '" . __('MMK', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (150, '" . __('Namibia') ."', 'NA', '" . __('Namibian Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('NAD', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (151, '" . __('Nauru') ."', 'NR', '" . __('Australian Dollar') . "', '" . __('$', 'wpsc') . "', '" . __('&#036;', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (152, '" . __('Nepal') ."', 'NP', '" . __('Nepalese Rupee') . "', '', '', '" . __('NPR', 'wpsc') . "', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (153, '" . __('Netherlands') ."', 'NL', '" . __('Euro') . "', " . __('€', 'wpsc') . ", '" . __('&#8364;', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (154, '" . __('Netherlands Antilles') ."', 'AN', '" . __('Netherlands Antillean Guilder') . "', '', '', '" . __('ANG', 'wpsc') . "', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (155, '" . __('New Caledonia (French)') ."', 'NC', '" . __('CFP Franc') . "', '', '', 'XPF', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (156, '" . __('New Zealand') ."', 'NZ', '" . __('New Zealand Dollar') . "', '$', '&#036;', 'NZD', '0', '12.5','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (157, '" . __('Nicaragua') ."', 'NI', '" . __('Nicaraguan Cordoba Oro') . "', '', '', 'NIC', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (158, '" . __('Niger') ."', 'NE', '" . __('CFA Franc BCEAO') . "', '', '', 'XOF', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (159, '" . __('Nigeria') ."', 'NG', '" . __('Nigerian Naira') . "', '', '', 'NGN', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (160, '" . __('Niue') ."', 'NU', '" . __('New Zealand Dollar') . "', '$', '&#036;', 'NZD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (161, '" . __('Norfolk Island') ."', 'NF', '" . __('Australian Dollar') . "', '$', '&#036;', 'AUD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (162, '" . __('Northern Mariana Islands') ."', 'MP', '" . __('US Dollar') . "', '$', '&#036;', 'USD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (163, '" . __('Norway') ."', 'NO', '" . __('Norwegian Krone') . "', '', '', 'NOK', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (164, '" . __('Oman') ."', 'OM', '" . __('Omani Rial') . "', '', '', 'OMR', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (165, '" . __('Pakistan') ."', 'PK', '" . __('Pakistan Rupee') . "', '', '', 'PKR', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (166, '" . __('Palau') ."', 'PW', '" . __('US Dollar') . "', '$', '&#036;', 'USD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (167, '" . __('Panama') ."', 'PA', '" . __('Panamanian Balboa') . "', '', '', 'PAB', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (168, '" . __('Papua New Guinea') ."', 'PG', '" . __('Papua New Guinea Kina') . "', '', '', 'PGK', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (169, '" . __('Paraguay') ."', 'PY', '" . __('Paraguay Guarani') . "', '', '', 'PYG', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (170, '" . __('Peru') ."', 'PE', '" . __('Peruvian Nuevo Sol') . "', '', '', 'PEN', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (171, '" . __('Philippines') ."', 'PH', '" . __('Philippine Peso') . "', '', '', 'PHP', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (172, '" . __('Pitcairn Island') ."', 'PN', '" . __('New Zealand Dollar') . "', '$', '&#036;', 'NZD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (173, '" . __('Poland') ."', 'PL', '" . __('Polish Zloty') . "', '', '', 'PLN', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (174, '" . __('Polynesia (French)') ."', 'PF', '" . __('CFP Franc') . "', '', '', 'XPF', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (175, '" . __('Portugal') ."', 'PT', '" . __('Euro') . "', '€', '&#8364;', 'EUR', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (176, '" . __('Puerto Rico') ."', 'PR', '" . __('US Dollar') . "', '$', '&#036;', 'USD', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (177, '" . __('Qatar') ."', 'QA', '" . __('Qatari Rial') . "', '', '', 'QAR', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (178, '" . __('Reunion (French)') ."', 'RE', '" . __('Euro') . "', '€', '&#8364;', 'EUR', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (179, '" . __('Romania') ."', 'RO', '" . __('Romanian Leu') . "', '', '', 'RON', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (180, '" . __('Russia') ."', 'RU', '" . __('Russian Ruble') . "', '', '', 'RUR', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (181, '" . __('Rwanda') ."', 'RW', '" . __('Rwanda Franc') . "', '', '', 'RWF', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (182, '" . __('Saint Helena') ."', 'SH', '" . __('St. Helena Pound') . "', '', '', 'SHP', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (183, '" . __('Saint Kitts & Nevis Anguilla') ."', 'KN', '" . __('East Caribbean Dollar') . "', '$', '&#036;', 'XCD', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (184, '" . __('Saint Lucia') ."', 'LC', '" . __('East Caribbean Dollar') . "', '$', '&#036;', 'XCD', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (185, '" . __('Saint Pierre and Miquelon') ."', 'PM', '" . __('Euro') . "', '€', '&#8364;', 'EUR', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (186, '" . __('Saint Vincent & Grenadines') ."', 'VC', '" . __('East Caribbean Dollar') . "', '$', '&#036;', 'XCD', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (187, '" . __('Samoa') ."', 'WS', '" . __('Samoan Tala') . "', '', '', 'WST', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (188, '" . __('San Marino') ."', 'SM', '" . __('Italian Lira') . "', '', '', 'ITL', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (189, '" . __('Sao Tome and Principe') ."', 'ST', '" . __('Dobra') . "', '', '', 'STD', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (190, '" . __('Saudi Arabia') ."', 'SA', '" . __('Saudi Riyal') . "', '', '', 'SAR', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (191, '" . __('Senegal') ."', 'SN', '" . __('CFA Franc BCEAO') . "', '', '', 'XOF', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (192, '" . __('Seychelles') ."', 'SC', '" . __('Seychelles Rupee') . "', '', '', 'SCR', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (193, '" . __('Sierra Leone') ."', 'SL', '" . __('Sierra Leone Leone') . "', '', '', 'SLL', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (194, '" . __('Singapore') ."', 'SG', '" . __('Singapore Dollar') . "', '$', '&#036;', 'SGD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (195, '" . __('Slovakia') ."', 'SK', '" . __('Euro') . "', '€', '&#8364;', 'EUR', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (196, '" . __('Slovenia') ."', 'SI', '" . __('Slovenian Tolar') . "', '', '', 'SIT', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (197, '" . __('Solomon Islands') ."', 'SB', '" . __('Solomon Islands Dollar') . "', '$', '&#036;', 'SBD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (198, '" . __('Somalia') ."', 'SO', '" . __('Somali Shilling') . "', '', '', 'SOD', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (199, '" . __('South Africa') ."', 'ZA', '" . __('South African Rand') . "', '', '', 'ZAR', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (200, '" . __('South Georgia & South Sandwich Islands') ."', 'GS', '" . __('Pound Sterling') . "', '£', '&#163;', 'GBP', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (201, '" . __('Spain') ."', 'ES', '" . __('Euro') . "', '€', '&#8364;', 'EUR', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (202, '" . __('Sri Lanka') ."', 'LK', '" . __('Sri Lanka Rupee') . "', '', '', 'LKR', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (203, '" . __('Sudan') ."', 'SD', '" . __('Sudanese Dinar') . "', '', '', 'SDD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (204, '" . __('Suriname') ."', 'SR', '" . __('Surinam Guilder') . "', '', '', 'SRG', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (205, '" . __('Svalbard and Jan Mayen Islands') ."', 'SJ', '" . __('Norwegian Krone') . "', '', '', 'NOK', '0', '0','','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (206, '" . __('Swaziland') ."', 'SZ', '" . __('Swaziland Lilangeni') . "', '', '', 'SZL', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (207, '" . __('Sweden') ."', 'SE', '" . __('Swedish Krona') . "', '', '', 'SEK', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (208, '" . __('Switzerland') ."', 'CH', '" . __('Swiss Franc') . "', '', '', 'CHF', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (209, '" . __('Syria') ."', 'SY', '" . __('Syrian Pound') . "', '', '', 'SYP', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (210, '" . __('Taiwan') ."', 'TW', '" . __('Taiwan Dollar') . "', '$', '&#036;', 'TWD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (211, '" . __('Tajikistan') ."', 'TJ', '" . __('Tajik Ruble') . "', '', '', 'TJR', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (212, '" . __('Tanzania') ."', 'TZ', '" . __('Tanzanian Shilling') . "', '', '', 'TZS', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (213, '" . __('Thailand') ."', 'TH', '" . __('Thai Baht') . "', '', '', 'THB', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (214, '" . __('Togo') ."', 'TG', '" . __('CFA Franc BCEAO') . "', '', '', 'XOF', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (215, '" . __('Tokelau') ."', 'TK', '" . __('New Zealand Dollar') . "', '$', '&#036;', 'NZD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (216, '" . __('Tonga') ."', 'TO', '" . __('Tongan Pa&#699;anga') . "', '', '', 'TOP', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (217, '" . __('Trinidad and Tobago') ."', 'TT', '" . __('Trinidad and Tobago Dollar') . "', '$', '&#036;', 'TTD', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (218, '" . __('Tunisia') ."', 'TN', '" . __('Tunisian Dollar') . "', '$', '&#036;', 'TND', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (219, '" . __('Turkey') ."', 'TR', '" . __('Turkish Lira') . "', '', '', 'TRL', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (220, '" . __('Turkmenistan') ."', 'TM', '" . __('Manat') . "', '', '', 'TMM', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (221, '" . __('Turks and Caicos Islands') ."', 'TC', '" . __('US Dollar') . "', '$', '&#036;', 'USD', '0', '0', 'northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (222, '" . __('Tuvalu') ."', 'TV', '" . __('Australian Dollar') . "', '$', '&#036;', 'AUD', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (223, '" . __('U.K.') ."', 'UK', '" . __('Pound Sterling') . "', '£', '&#163;', 'GBP', '0', '17.5','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (224, '" . __('Uganda') ."', 'UG', '" . __('Uganda Shilling') . "', '', '', 'UGS', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (225, '" . __('Ukraine') ."', 'UA', '" . __('Ukraine Hryvnia') . "', '', '', 'UAG', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (226, '" . __('United Arab Emirates') ."', 'AE', '" . __('Arab Emirates Dirham') . "', '', '', 'AED', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (227, '" . __('Uruguay') ."', 'UY', '" . __('Uruguayan Peso') . "', '', '', 'UYP', '0', '0','southamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (228, '" . __('USA Minor Outlying Islands') ."', 'UM', '" . __('US Dollar') . "', '$', '&#036;', 'USD', '0', '0','','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (229, '" . __('Uzbekistan') ."', 'UZ', '" . __('Uzbekistan Sum') . "', '', '', 'UZS', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (230, '" . __('Vanuatu') ."', 'VU', '" . __('Vanuatu Vatu') . "', '', '', 'VUV', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (231, '" . __('Vatican') ."', 'VA', '" . __('Euro') . "', '€', '&#8364;', 'EUR', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (232, '" . __('Venezuela') ."', 'VE', '" . __('Venezuelan Bolivar') . "', '', '', 'VUB', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (233, '" . __('Vietnam') ."', 'VN', '" . __('Vietnamese Dong') . "', '', '', 'VND', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (234, '" . __('Virgin Islands (British)') ."', 'VG', '" . __('US Dollar') . "', '$', '&#036;', 'USD', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (235, '" . __('Virgin Islands (USA)') ."', 'VI', '" . __('US Dollar') . "', '$', '&#036;', 'USD', '0', '0','northamerica','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (236, '" . __('Wallis and Futuna Islands') ."', 'WF', '" . __('CFP Franc') . "', '', '', 'XPF', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (237, '" . __('Western Sahara') ."', 'EH', '" . __('Moroccan Dirham') . "', '', '', 'MAD', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (238, '" . __('Yemen') ."', 'YE', '" . __('Yemeni Rial') . "', '', '', 'YER', '0', '0','asiapacific','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (239, '" . __('Yugoslavia') ."', 'YU', '" . __('Yugoslav New Dinar') . "', '', '', 'YUN', '0', '0','europe','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (240, '" . __('Zambia') ."', 'ZM', '" . __('Zambian Kwacha') . "', '', '', 'ZMK', '0', '0','africa','1');
-            -
            INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (241, '" . __('Zimbabwe') ."', 'ZW', '" . __('Zimbabwe Dollar') . "', '$', '&#036;', 'ZWD', '0', '0','africa','1');"; ?>


1	<?php
2	+ $currency_sql="INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (1, '" . __('Mauritania') ."', 'MR', '" . __('Mauritanian Ouguiya', 'wpsc') ."', '', '', '" . __('MRO', 'wpsc') . "', '0', '0','africa','1');
3	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (2, '" . __('Martinique (French)') ."', 'MQ', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','southamerica','1');
4	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (3, '" . __('Malta') ."', 'MT', '" . __('Maltese Lira', 'wpsc') ."', '', '', '" . __('MTL', 'wpsc') . "', '0', '0' ,'europe','1');
5	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (4, '" . __('Marshall Islands') ."', 'MH', '" . __('US Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0' ,'asiapacific','1');
6	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (5, '" . __('Mali') ."', 'ML', '" . __('CFA Franc BCEAO', 'wpsc') ."', '', '', '" . __('XOF', 'wpsc') . "', '0', '0' ,'africa','1');
7	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (6, '" . __('Maldives') ."', 'MV', '" . __('Maldive Rufiyaa', 'wpsc') ."', '', '', '" . __('MVR', 'wpsc') . "', '0', '0' , 'asiapacific','1');
8	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (7, '" . __('Malaysia') ."', 'MY', '" . __('Malaysian Ringgit', 'wpsc') ."', '', '', '" . __('MYR', 'wpsc') . "', '0', '0', 'asiapacific','1');
9	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (8, '" . __('Malawi') ."', 'MW', '" . __('Malawi Kwacha', 'wpsc') ."', '', '', '" . __('MWK', 'wpsc') . "', '0', '0','africa','1');
10	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (9, '" . __('Madagascar') ."', 'MG', '" . __('Malagasy Franc', 'wpsc') ."', '', '', '" . __('MGF', 'wpsc') . "', '0', '0','africa','1');
11	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (10, '" . __('Macau') ."', 'MO', '" . __('Macau Pataca', 'wpsc') ."', '', '', '" . __('MOP', 'wpsc') . "', '0', '0', 'asiapacific','1');
12	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (11, '" . __('Macedonia') ."', 'MK', '" . __('Denar', 'wpsc') ."', '', '', '" . __('MKD', 'wpsc') . "', '0', '0','europe','1');
13	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (12, '" . __('Luxembourg') ."', 'LU', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
14	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (13, '" . __('Lithuania') ."', 'LT', '" . __('Lithuanian Litas', 'wpsc') ."', '', '', '" . __('LTL', 'wpsc') . "', '0', '0','europe','1');
15	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (14, '" . __('Liechtenstein') ."', 'LI', '" . __('Swiss Franc', 'wpsc') ."', '', '', '" . __('CHF', 'wpsc') . "', '0', '0','europe','1');
16	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (15, '" . __('Libya') ."', 'LY', '" . __('Libyan Dinar', 'wpsc') ."', '', '', '" . __('LYD', 'wpsc') . "', '0', '0','africa','1');
17	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (16, '" . __('Liberia') ."', 'LR', '" . __('Liberian Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('LRD', 'wpsc') . "', '0', '0','africa','1');
18	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (17, '" . __('Lesotho') ."', 'LS', '" . __('Lesotho Loti', 'wpsc') ."', '', '', '" . __('LSL', 'wpsc') . "', '0', '0','africa','1');
19	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (18, '" . __('Lebanon') ."', 'LB', '" . __('Lebanese Pound', 'wpsc') ."', '', '', '" . __('LBP', 'wpsc') . "', '0', '0', 'asiapacific','1');
20	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (19, '" . __('Latvia') ."', 'LV', '" . __('Latvian Lats', 'wpsc') ."', '', '', '" . __('LVL', 'wpsc') . "', '0', '0','europe','1');
21	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (20, '" . __('Laos') ."', 'LA', '" . __('Lao Kip', 'wpsc') ."', '', '', '" . __('LAK', 'wpsc') . "', '0', '0', 'asiapacific','1');
22	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (21, '" . __('Kyrgyzstan') ."', 'KG', '" . __('Som', 'wpsc') ."', '', '', '" . __('KGS', 'wpsc') . "', '0', '0', 'asiapacific','1');
23	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (22, '" . __('Kuwait') ."', 'KW', '" . __('Kuwaiti Dinar', 'wpsc') ."', '', '', '" . __('KWD', 'wpsc') . "', '0', '0', 'asiapacific','1');
24	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (23, '" . __('Korea, South') ."', 'KR', '" . __('Korean Won', 'wpsc') ."', '', '', '" . __('KRW', 'wpsc') . "', '0', '0', 'asiapacific','1');
25	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (24, '" . __('Korea, North') ."', 'KP', '" . __('North Korean Won', 'wpsc') ."', '', '', '" . __('KPW', 'wpsc') . "', '0', '0', 'asiapacific','1');
26	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (25, '" . __('Kiribati') ."', 'KI', '" . __('Australian Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0', 'asiapacific','1');
27	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (26, '" . __('Kenya') ."', 'KE', '" . __('Kenyan Shilling', 'wpsc') ."', '', '', '" . __('KES', 'wpsc') . "', '0', '0','africa','1');
28	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (27, '" . __('Kazakhstan') ."', 'KZ', '" . __('Kazakhstan Tenge', 'wpsc') ."', '', '', '" . __('KZT', 'wpsc') . "', '0', '0' ,'asiapacific','1');
29	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (28, '" . __('Jordan') ."', 'JO', '" . __('Jordanian Dinar', 'wpsc') ."', '', '', '" . __('JOD', 'wpsc') . "', '0', '0', 'asiapacific','1');
30	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (29, '" . __('Jersey') ."', 'JE', '" . __('Pound Sterling', 'wpsc') ."', '" . __('£', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0','europe','1');
31	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (30, '" . __('Japan') ."', 'JP', '" . __('Japanese Yen', 'wpsc') ."', '" . __('¥', 'wpsc') . "', '" . __('¥', 'wpsc') . "', '" . __('JPY', 'wpsc') . "', '0', '0', 'asiapacific','1');
32	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (31, '" . __('Jamaica') ."', 'JM', '" . __('Jamaican Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('JMD', 'wpsc') . "', '0', '0' ,'southamerica','1');
33	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (32, '" . __('Ivory Coast') ."', 'CI', '" . __('CFA Franc BCEAO', 'wpsc') ."', '', '', '" . __('XOF', 'wpsc') . "', '0', '0' ,'africa','1');
34	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (33, '" . __('Italy') ."', 'IT', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
35	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (34, '" . __('Isle of Man') ."', 'IM', '" . __('Pound Sterling', 'wpsc') ."', '" . __('£', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0','europe','1');
36	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (35, '" . __('Israel') ."', 'IL', '" . __('Israeli New Shekel', 'wpsc') ."', '', '', '" . __('ILS', 'wpsc') . "', '0', '0', 'asiapacific','1');
37	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (36, '" . __('Ireland') ."', 'IE', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
38	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (37, '" . __('Iraq') ."', 'IQ', '" . __('Iraqi Dinar', 'wpsc') ."', '', '', '" . __('IQD', 'wpsc') . "', '0', '0', 'asiapacific','1');
39	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (38, '" . __('Indonesia') ."', 'ID', '" . __('Indonesian Rupiah', 'wpsc') ."', '', '', '" . __('IDR', 'wpsc') . "', '0', '0', 'asiapacific','1');
40	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (39, '" . __('Iran') ."', 'IR', '" . __('Iranian Rial', 'wpsc') ."', '', '', '" . __('IRR', 'wpsc') . "', '0', '0', 'asiapacific','1');
41	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (40, '" . __('India') ."', 'IN', '" . __('Indian Rupee', 'wpsc') ."', '', '', '" . __('INR', 'wpsc') . "', '0', '0', 'asiapacific','1');
42	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (41, '" . __('Iceland') ."', 'IS', '" . __('Iceland Krona', 'wpsc') ."', '', '', '" . __('ISK', 'wpsc') . "', '0', '0', 'europe','1');
43	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (42, '" . __('Hungary') ."', 'HU', '" . __('Hungarian Forint', 'wpsc') ."', '', '', '" . __('HUF', 'wpsc') . "', '0', '0', 'europe','1');
44	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (43, '" . __('Hong Kong') ."', 'HK', '" . __('Hong Kong Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('HKD', 'wpsc') . "', '0', '0', 'asiapacific','1');
45	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (44, '" . __('Honduras') ."', 'HN', '" . __('Honduran Lempira', 'wpsc') ."', '', '', '" . __('HNL', 'wpsc') . "', '0', '0' , 'southamerica','1');
46	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (45, '" . __('Heard Island and McDonald Islands') ."', 'HM', '" . __('Australian Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
47	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (46, '" . __('Haiti') ."', 'HT', '" . __('Haitian Gourde', 'wpsc') ."', '', '', '" . __('HTG', 'wpsc') . "', '0', '0', 'southamerica','1');
48	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (47, '" . __('Guyana') ."', 'GY', '" . __('Guyana Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('GYD', 'wpsc') . "', '0', '0', 'southamerica','1');
49	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (48, '" . __('Guinea Bissau') ."', 'GW', '" . __('Guinea-Bissau Peso', 'wpsc') ."', '', '', '" . __('GWP', 'wpsc') . "', '0', '0' ,'africa','1');
50	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (49, '" . __('Guinea') ."', 'GN', '" . __('Guinea Franc', 'wpsc') ."', '', '', '" . __('GNF', 'wpsc') . "', '0', '0','africa','1');
51	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (50, '" . __('Guernsey') ."', 'GF', '" . __('Pound Sterling', 'wpsc') ."', '" . __('£', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0' ,'europe','1');
52	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (51, '" . __('Guatemala') ."', 'GT', '" . __('Guatemalan Quetzal', 'wpsc') ."', '', '', '" . __('QTQ', 'wpsc') . "', '0', '0', 'southamerica','1');
53	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (52, '" . __('Guam (USA)') ."', 'GU', '" . __('US Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0', 'asiapacific','1');
54	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (53, '" . __('Grenada') ."', 'GD', '" . __('East Carribean Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','africa','1');
55	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (54, '" . __('Guadeloupe (French)') ."', 'GP', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0', 'southamerica','1');
56	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (55, '" . __('Greenland') ."', 'GL', '" . __('Danish Krone', 'wpsc') ."', '', '', '" . __('DKK', 'wpsc') . "', '0', '0','europe','1');
57	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (56, '" . __('Greece') ."', 'GR', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '19','europe','1');
58	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (57, '" . __('Gibraltar') ."', 'GI', '" . __('Gibraltar Pound', 'wpsc') ."', '', '', '" . __('GIP', 'wpsc') . "', '0', '0', 'europe','1');
59	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (58, '" . __('Ghana') ."', 'GH', '" . __('Ghanaian Cedi', 'wpsc') ."', '', '', '" . __('GHC', 'wpsc') . "', '0', '0','africa','1');
60	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (59, '" . __('Germany') ."', 'DE', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
61	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (60, '" . __('Georgia') ."', 'GE', '" . __('Georgian Lari', 'wpsc') ."', '', '', '" . __('GEL', 'wpsc') . "', '0', '0','europe','1');
62	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (61, '" . __('Gambia') ."', 'GM', '" . __('Gambian Dalasi', 'wpsc') ."', '', '', '" . __('GMD', 'wpsc') . "', '0', '0','africa','1');
63	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (62, '" . __('Gabon') ."', 'GA', '" . __('CFA Franc BEAC', 'wpsc') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
64	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (63, '" . __('French Southern Territories') ."', 'TF', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','africa','1');
65	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (64, '" . __('France') ."', 'FR', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0', 'europe','1');
66	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (65, '" . __('Finland') ."', 'FI', '" . __('Euro', 'wpsc') ."', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0', 'europe','1');
67	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (66, '" . __('Fiji') ."', 'FJ', '" . __('Fiji Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('FJD', 'wpsc') . "', '0', '0', 'asiapacific','1');
68	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (67, '" . __('Faroe Islands') ."', 'FO', '" . __('Danish Krone', 'wpsc') ."', '', '', '" . __('DKK', 'wpsc') . "', '0', '0' ,'europe','1');
69	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (68, '" . __('Falkland Islands') ."', 'FK', '" . __('Falkland Islands Pound', 'wpsc') ."', '', '', '" . __('FKP', 'wpsc') . "', '0', '0' ,'southamerica','1');
70	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (69, '" . __('Ethiopia') ."', 'ET', '" . __('Ethiopian Birr', 'wpsc') ."', '', '', '" . __('ETB', 'wpsc') . "', '0', '0','africa','1');
71	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (70, '" . __('Estonia') ."', 'EE', '" . __('Estonian Kroon', 'wpsc') ."', '', '', '" . __('EEK', 'wpsc') . "', '0', '0', 'europe','1');
72	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (71, '" . __('Eritrea') ."', 'ER', '" . __('Eritrean Nakfa', 'wpsc') ."', '', '', '" . __('ERN', 'wpsc') . "', '0', '0','africa','1');
73	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (72, '" . __('Equatorial Guinea') ."', 'GQ', '" . __('CFA Franc BEAC', 'wpsc') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
74	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (73, '" . __('El Salvador') ."', 'SV', '" . __('El Salvador Colon', 'wpsc') ."', '', '', '" . __('SVC', 'wpsc') . "', '0', '0','southamerica','1');
75	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (74, '" . __('Egypt') ."', 'EG', '" . __('Egyptian Pound', 'wpsc') ."', '', '', '" . __('EGP', 'wpsc') . "', '0', '0','africa','1');
76	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (75, '" . __('Ecuador') ."', 'EC', '" . __('Ecuador Sucre', 'wpsc') ."', '', '', '" . __('ECS', 'wpsc') . "', '0', '0','southamerica','1');
77	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (76, '" . __('East Timor') ."', 'TP', '" . __('Timor Escudo', 'wpsc') ."', '', '', '" . __('TPE', 'wpsc') . "', '0', '0','asiapacific','1');
78	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (77, '" . __('Dominican Republic') ."', 'DO', '" . __('Dominican Peso', 'wpsc') ."', '', '', '" . __('DOP', 'wpsc') . "', '0', '0','southamerica','1');
79	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (78, '" . __('Dominica') ."', 'DM', '" . __('East Caribbean Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','southamerica','1');
80	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (79, '" . __('Djibouti') ."', 'DJ', '" . __('Djibouti Franc', 'wpsc') ."', '', '', '" . __('DJF', 'wpsc') . "', '0', '0','africa','1');
81	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (80, '" . __('Denmark') ."', 'DK', '" . __('Danish Krone', 'wpsc') ."', '', '', '" . __('DKK', 'wpsc') . "', '0', '0','europe','1');
82	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (81, '" . __('Democratic Republic of Congo') ."', 'CD', '" . __('Francs', 'wpsc') ."', '', '', '" . __('CDF', 'wpsc') . "', '0', '0','africa','1');
83	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (82, '" . __('Czech Rep.') ."', 'CZ', '" . __('Czech Koruna', 'wpsc') ."', '', '', '" . __('CZK', 'wpsc') . "', '0', '0','europe','1');
84	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (83, '" . __('Cyprus') ."', 'CY', '" . __('Cyprus Pound', 'wpsc') ."', '', '', '" . __('CYP', 'wpsc') . "', '0', '0','europe','1');
85	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (84, '" . __('Cuba') ."', 'CU', '" . __('Cuban Peso', 'wpsc') ."', '', '', '" . __('CUP', 'wpsc') . "', '0', '0','northamerica','1');
86	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (85, '" . __('Croatia') ."', 'HR', '" . __('Croatian Kuna', 'wpsc') ."', '', '', '" . __('HRK', 'wpsc') . "', '0', '0','europe','1');
87	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (86, '" . __('Costa Rica') ."', 'CR', '" . __('Costa Rican Colon', 'wpsc') ."', '', '', '" . __('CRC', 'wpsc') . "', '0', '0','southamerica','1');
88	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (87, '" . __('Cook Islands') ."', 'CK', '" . __('New Zealand Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('NZD', 'wpsc') . "', '0', '0' ,'asiapacific','1');
89	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (88, '" . __('Congo') ."', 'CG', '" . __('CFA Franc BEAC', 'wpsc') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
90	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (89, '" . __('Comoros') ."', 'KM', '" . __('Comoros Franc', 'wpsc') ."', '', '', '" . __('KMF', 'wpsc') . "', '0', '0','africa','1');
91	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (90, '" . __('Colombia') ."', 'CO', '" . __('Colombian Peso', 'wpsc') ."', '', '', '" . __('COP', 'wpsc') . "', '0', '0','southamerica','1');
92	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (91, '" . __('Cocos (Keeling) Islands') ."', 'CC', '" . __('Australian Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', 'AUD', '0', '0','asiapacific','1');
93	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (92, '" . __('Christmas Island') ."', 'CX', '" . __('Australian Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
94	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (93, '" . __('Chile') ."', 'CL', '" . __('Chilean Peso', 'wpsc') ."', '', '', '" . __('CLP', 'wpsc') . "', '0', '0','asiapacific','1');
95	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (94, '" . __('China') ."', 'CN', '" . __('Yuan Renminbi', 'wpsc') ."', '', '', '" . __('CNY', 'wpsc') . "', '0', '0' ,'asiapacific','1');
96	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (95, '" . __('Chad') ."', 'TD', '" . __('CFA Franc BEAC', 'wpsc') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
97	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (96, '" . __('Central African Republic') ."', 'CF', '" . __('CFA Franc BEAC', 'wpsc') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
98	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (97, '" . __('Cayman Islands') ."', 'KY', '" . __('Cayman Islands Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('KYD', 'wpsc') . "', '0', '0','northamerica','1');
99	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (98, '" . __('Cape Verde') ."', 'CV', '" . __('Cape Verde Escudo', 'wpsc') ."', '', '', '" . __('CVE', 'wpsc') . "', '0', '0','africa','1');
100	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (99, '" . __('Cameroon') ."', 'CM', '" . __('CFA Franc BEAC', 'wpsc') ."', '', '', '" . __('XAF', 'wpsc') . "', '0', '0','africa','1');
101	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (100, '" . __('Canada') ."', 'CA', '" . __('Canadian Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('CAD', 'wpsc') . "', '1', '','northamerica','1');
102	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (101, '" . __('Cambodia') ."', 'KH', '" . __('Kampuchean Riel', 'wpsc') ."', '', '', '" . __('KHR', 'wpsc') . "', '0', '0','asiapacific','1');
103	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (102, '" . __('Burundi') ."', 'BI', '" . __('Burundi Franc', 'wpsc') ."', '', '', '" . __('BIF', 'wpsc') . "', '0', '0','africa','1');
104	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (103, '" . __('Burkina Faso') ."', 'BF', '" . __('CFA Franc BCEAO', 'wpsc') ."', '', '', '" . __('XOF', 'wpsc') . "', '0', '0','africa','1');
105	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (104, '" . __('Bulgaria') ."', 'BG', '" . __('Bulgarian Lev', 'wpsc') ."', '', '', '" . __('BGL', 'wpsc') . "', '0', '0','europe','1');
106	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (105, '" . __('Brunei Darussalam') ."', 'BN', '" . __('Brunei Dollar', 'wpsc') ."', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('BND', 'wpsc') . "', '0', '0','asiapacific','1');
107	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (106, '" . __('British Indian Ocean Territory') ."', 'IO', '" . __('US Dollar', 'wpsc') ."', '$', '$', 'USD', '0', '0','asiapacific','1');
108	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (107, '" . __('Brazil') ."', 'BR', '" . __('Brazilian Real', 'wpsc') ."', '', '', '" . __('BRL', 'wpsc') . "', '0', '0','southamerica','1');
109	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (108, '" . __('Bouvet Island') ."', 'BV', '" . __('Norwegian Krone', 'wpsc') ."', '', '', '" . __('NOK', 'wpsc') . "', '0', '0','africa','1');
110	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (109, '" . __('Botswana') ."', 'BW', '" . __('Botswana Pula', 'wpsc') ."', '', '', '" . __('BWP', 'wpsc') . "', '0', '0','africa','1');
111	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (110, '" . __('Bosnia-Herzegovina') ."', 'BA', '" . __('Marka', 'wpsc') ."', '', '', '" . __('BAM', 'wpsc') . "', '0', '0','europe','1');
112	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (111, '" . __('Bolivia') ."', 'BO', '" . __('Boliviano', 'wpsc') . "', '', '', '" . __('BOB', 'wpsc') . "', '0', '0','southamerica','1');
113	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (112, '" . __('Bhutan') ."', 'BT', '" . __('Bhutan Ngultrum', 'wpsc') . "', '', '', '" . __('BTN', 'wpsc') . "', '0', '0','asiapacific','1');
114	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (113, '" . __('Bermuda') ."', 'BM', '" . __('Bermudian Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('BMD', 'wpsc') . "', '0', '0','europe','1');
115	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (114, '" . __('Benin') ."', 'BJ', '" . __('CFA Franc BCEAO', 'wpsc') . "', '', '', '" . __('XOF', 'wpsc') . "', '0', '0','africa','1');
116	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (115, '" . __('Belize') ."', 'BZ', '" . __('Belize Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('BZD', 'wpsc') . "', '0', '0','northamerica','1');
117	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (116, '" . __('Belgium') ."', 'BE', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
118	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (117, '" . __('Belarus') ."', 'BY', '" . __('Belarussian Ruble', 'wpsc') . "', '', '', '" . __('BYB', 'wpsc') . "', '0', '0','europe','1');
119	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (118, '" . __('Barbados') ."', 'BB', '" . __('Barbados Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('BBD', 'wpsc') . "', '0', '0','southamerica','1');
120	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (119, '" . __('Bangladesh') ."', 'BD', '" . __('Bangladeshi Taka', 'wpsc') . "', '', '', '" . __('BDT', 'wpsc') . "', '0', '0','asiapacific','1');
121	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (120, '" . __('Bahrain') ."', 'BH', '" . __('Bahraini Dinar', 'wpsc') . "', '', '', '" . __('BHD', 'wpsc') . "', '0', '0','asiapacific','1');
122	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (121, '" . __('Bahamas') ."', 'BS', '" . __('Bahamian Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('BSD', 'wpsc') . "', '0', '0','northamerica','1');
123	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (122, '" . __('Azerbaijan') ."', 'AZ', '" . __('Azerbaijanian Manat', 'wpsc') . "', '', '', '" . __('AZM', 'wpsc') . "', '0', '0','asiapacific','1');
124	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (123, '" . __('Austria') ."', 'AT', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
125	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (124, '" . __('Aruba') ."', 'AW', '" . __('Aruban Guilder', 'wpsc') . "', '', '', '" . __('AWG', 'wpsc') . "', '0', '0','southamerica','1');
126	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (125, '" . __('Armenia') ."', 'AM', '" . __('Armenian Dram', 'wpsc') . "', '', '', '" . __('AMD', 'wpsc') . "', '0', '0','asiapacific','1');
127	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (126, '" . __('Argentina') ."', 'AR', '" . __('Argentine Peso', 'wpsc') . "', '', '', '" . __('ARS', 'wpsc') . "', '0', '0','southamerica','1');
128	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (127, '" . __('Antigua and Barbuda') ."', 'AG', '" . __('East Caribbean Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','africa','1');
129	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (128, '" . __('Antarctica') ."', 'AQ', '" . __('Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('ATA', 'wpsc') . "', '0', '0','antarctica','1');
130	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (129, '" . __('Anguilla') ."', 'AI', '" . __('East Caribbean Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','northamerica','1');
131	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (130, '" . __('Angola') ."', 'AO', '" . __('Angolan New Kwanza', 'wpsc') . "', '', '', '" . __('AON', 'wpsc') . "', '0', '0','africa','1');
132	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (131, '" . __('Andorra') ."', 'AD', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
133	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (132, '" . __('American Samoa') ."', 'AS', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','asiapacific','1');
134	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (133, '" . __('Algeria') ."', 'DZ', '" . __('Algerian Dinar', 'wpsc') . "', '', '', '" . __('DZD', 'wpsc') . "', '0', '0','africa','1');
135	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (134, '" . __('Albania') ."', 'AL', '" . __('Albanian Lek', 'wpsc') . "', '', '', '" . __('ALL', 'wpsc') . "', '0', '0','europe','1');
136	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (135, '" . __('Afghanistan') ."', 'AF', '" . __('Afghanistan Afghani', 'wpsc') . "', '', '', '" . __('AFA', 'wpsc') . "', '0', '0','asiapacific','1');
137	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (136, '" . __('USA') ."', 'US', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '1', '','northamerica','1');
138	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (137, '" . __('Australia') ."', 'AU', '" . __('Australian Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
139	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (138, '" . __('Great Britain') ."', 'GB', '" . __('Pound Sterling', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0','europe','1');
140	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (139, '" . __('Mauritius') ."', 'MU', '" . __('Mauritius Rupee', 'wpsc') . "', '', '', '" . __('MUR', 'wpsc') . "', '0', '0','africa','1');
141	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (140, '" . __('Mayotte') ."', 'YT', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
142	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (141, '" . __('Mexico') ."', 'MX', '" . __('Mexican Nuevo Peso', 'wpsc') . "', '', '', '" . __('MXN', 'wpsc') . "', '0', '0','northamerica','1');
143	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (142, '" . __('Micronesia') ."', 'FM', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','asiapacific','1');
144	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (143, '" . __('Moldova') ."', 'MD', '" . __('Moldovan Leu', 'wpsc') . "', '', '', '" . __('MDL', 'wpsc') . "', '0', '0','europe','1');
145	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (144, '" . __('Monaco') ."', 'MC', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
146	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (145, '" . __('Mongolia') ."', 'MN', '" . __('Mongolian Tugrik', 'wpsc') . "', '', '', '" . __('MNT', 'wpsc') . "', '0', '0','asiapacific','1');
147	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (146, '" . __('Montserrat') ."', 'MS', '" . __('East Caribbean Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','africa','1');
148	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (147, '" . __('Morocco') ."', 'MA', '" . __('Moroccan Dirham', 'wpsc') . "', '', '', '" . __('MAD', 'wpsc') . "', '0', '0','africa','1');
149	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (148, '" . __('Mozambique') ."', 'MZ', '" . __('Mozambique Metical', 'wpsc') . "', '', '', '" . __('MZM', 'wpsc') . "', '0', '0','africa','1');
150	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (149, '" . __('Myanmar') ."', 'MM', '" . __('Myanmar Kyat', 'wpsc') . "', '', '', '" . __('MMK', 'wpsc') . "', '0', '0','asiapacific','1');
151	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (150, '" . __('Namibia') ."', 'NA', '" . __('Namibian Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('NAD', 'wpsc') . "', '0', '0','africa','1');
152	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (151, '" . __('Nauru') ."', 'NR', '" . __('Australian Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
153	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (152, '" . __('Nepal') ."', 'NP', '" . __('Nepalese Rupee', 'wpsc') . "', '', '', '" . __('NPR', 'wpsc') . "', '0', '0','asiapacific','1');
154	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (153, '" . __('Netherlands') ."', 'NL', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
155	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (154, '" . __('Netherlands Antilles') ."', 'AN', '" . __('Netherlands Antillean Guilder', 'wpsc') . "', '', '', '" . __('ANG', 'wpsc') . "', '0', '0','africa','1');
156	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (155, '" . __('New Caledonia (French)') ."', 'NC', '" . __('CFP Franc', 'wpsc') . "', '', '', '" . __('XPF', 'wpsc') . "', '0', '0','asiapacific','1');
157	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (156, '" . __('New Zealand') ."', 'NZ', '" . __('New Zealand Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('NZD', 'wpsc') . "', '0', '12.5','asiapacific','1');
158	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (157, '" . __('Nicaragua') ."', 'NI', '" . __('Nicaraguan Cordoba Oro', 'wpsc') . "', '', '', '" . __('NIC', 'wpsc') . "', '0', '0','northamerica','1');
159	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (158, '" . __('Niger') ."', 'NE', '" . __('CFA Franc BCEAO', 'wpsc') . "', '', '', '" . __('XOF', 'wpsc') . "', '0', '0','africa','1');
160	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (159, '" . __('Nigeria') ."', 'NG', '" . __('Nigerian Naira', 'wpsc') . "', '', '', '" . __('NGN', 'wpsc') . "', '0', '0','africa','1');
161	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (160, '" . __('Niue') ."', 'NU', '" . __('New Zealand Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('NZD', 'wpsc') . "', '0', '0','asiapacific','1');
162	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (161, '" . __('Norfolk Island') ."', 'NF', '" . __('Australian Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
163	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (162, '" . __('Northern Mariana Islands') ."', 'MP', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','asiapacific','1');
164	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (163, '" . __('Norway') ."', 'NO', '" . __('Norwegian Krone', 'wpsc') . "', '', '', '" . __('NOK', 'wpsc') . "', '0', '0','europe','1');
165	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (164, '" . __('Oman') ."', 'OM', '" . __('Omani Rial', 'wpsc') . "', '', '', '" . __('OMR', 'wpsc') . "', '0', '0','asiapacific','1');
166	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (165, '" . __('Pakistan') ."', 'PK', '" . __('Pakistan Rupee', 'wpsc') . "', '', '', '" . __('PKR', 'wpsc') . "', '0', '0','asiapacific','1');
167	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (166, '" . __('Palau') ."', 'PW', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','asiapacific','1');
168	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (167, '" . __('Panama') ."', 'PA', '" . __('Panamanian Balboa', 'wpsc') . "', '', '', '" . __('PAB', 'wpsc') . "', '0', '0','southamerica','1');
169	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (168, '" . __('Papua New Guinea') ."', 'PG', '" . __('Papua New Guinea Kina', 'wpsc') . "', '', '', '" . __('PGK', 'wpsc') . "', '0', '0','asiapacific','1');
170	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (169, '" . __('Paraguay') ."', 'PY', '" . __('Paraguay Guarani', 'wpsc') . "', '', '', '" . __('PYG', 'wpsc') . "', '0', '0','southamerica','1');
171	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (170, '" . __('Peru') ."', 'PE', '" . __('Peruvian Nuevo Sol', 'wpsc') . "', '', '', '" . __('PEN', 'wpsc') . "', '0', '0','southamerica','1');
172	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (171, '" . __('Philippines') ."', 'PH', '" . __('Philippine Peso', 'wpsc') . "', '', '', '" . __('PHP', 'wpsc') . "', '0', '0','asiapacific','1');
173	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (172, '" . __('Pitcairn Island') ."', 'PN', '" . __('New Zealand Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('NZD', 'wpsc') . "', '0', '0','asiapacific','1');
174	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (173, '" . __('Poland') ."', 'PL', '" . __('Polish Zloty', 'wpsc') . "', '', '', '" . __('PLN', 'wpsc') . "', '0', '0','europe','1');
175	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (174, '" . __('Polynesia (French)') ."', 'PF', '" . __('CFP Franc', 'wpsc') . "', '', '', '" . __('XPF', 'wpsc') . "', '0', '0','asiapacific','1');
176	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (175, '" . __('Portugal') ."', 'PT', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
177	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (176, '" . __('Puerto Rico') ."', 'PR', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','northamerica','1');
178	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (177, '" . __('Qatar') ."', 'QA', '" . __('Qatari Rial', 'wpsc') . "', '', '', '" . __('QAR', 'wpsc') . "', '0', '0','asiapacific','1');
179	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (178, '" . __('Reunion (French)') ."', 'RE', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
180	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (179, '" . __('Romania') ."', 'RO', '" . __('Romanian Leu', 'wpsc') . "', '', '', '" . __('RON', 'wpsc') . "', '0', '0','europe','1');
181	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (180, '" . __('Russia') ."', 'RU', '" . __('Russian Ruble', 'wpsc') . "', '', '', '" . __('RUR', 'wpsc') . "', '0', '0','europe','1');
182	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (181, '" . __('Rwanda') ."', 'RW', '" . __('Rwanda Franc', 'wpsc') . "', '', '', '" . __('RWF', 'wpsc') . "', '0', '0','africa','1');
183	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (182, '" . __('Saint Helena') ."', 'SH', '" . __('St. Helena Pound', 'wpsc') . "', '', '', '" . __('SHP', 'wpsc') . "', '0', '0','africa','1');
184	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (183, '" . __('Saint Kitts & Nevis Anguilla') ."', 'KN', '" . __('East Caribbean Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','northamerica','1');
185	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (184, '" . __('Saint Lucia') ."', 'LC', '" . __('East Caribbean Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','northamerica','1');
186	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (185, '" . __('Saint Pierre and Miquelon') ."', 'PM', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','northamerica','1');
187	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (186, '" . __('Saint Vincent & Grenadines') ."', 'VC', '" . __('East Caribbean Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('XCD', 'wpsc') . "', '0', '0','northamerica','1');
188	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (187, '" . __('Samoa') ."', 'WS', '" . __('Samoan Tala', 'wpsc') . "', '', '', '" . __('WST', 'wpsc') . "', '0', '0','asiapacific','1');
189	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (188, '" . __('San Marino') ."', 'SM', '" . __('Italian Lira', 'wpsc') . "', '', '', '" . __('ITL', 'wpsc') . "', '0', '0','europe','1');
190	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (189, '" . __('Sao Tome and Principe') ."', 'ST', '" . __('Dobra', 'wpsc') . "', '', '', '" . __('STD', 'wpsc') . "', '0', '0','africa','1');
191	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (190, '" . __('Saudi Arabia') ."', 'SA', '" . __('Saudi Riyal', 'wpsc') . "', '', '', '" . __('SAR', 'wpsc') . "', '0', '0','asiapacific','1');
192	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (191, '" . __('Senegal') ."', 'SN', '" . __('CFA Franc BCEAO', 'wpsc') . "', '', '', '" . __('XOF', 'wpsc') . "', '0', '0','africa','1');
193	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (192, '" . __('Seychelles') ."', 'SC', '" . __('Seychelles Rupee', 'wpsc') . "', '', '', '" . __('SCR', 'wpsc') . "', '0', '0','africa','1');
194	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (193, '" . __('Sierra Leone') ."', 'SL', '" . __('Sierra Leone Leone', 'wpsc') . "', '', '', '" . __('SLL', 'wpsc') . "', '0', '0','africa','1');
195	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (194, '" . __('Singapore') ."', 'SG', '" . __('Singapore Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('SGD', 'wpsc') . "', '0', '0','asiapacific','1');
196	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (195, '" . __('Slovakia') ."', 'SK', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
197	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (196, '" . __('Slovenia') ."', 'SI', '" . __('Slovenian Tolar', 'wpsc') . "', '', '', '" . __('SIT', 'wpsc') . "', '0', '0','europe','1');
198	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (197, '" . __('Solomon Islands') ."', 'SB', '" . __('Solomon Islands Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', 'SBD', '0', '0','asiapacific','1');
199	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (198, '" . __('Somalia') ."', 'SO', '" . __('Somali Shilling', 'wpsc') . "', '', '', '" . __('SOD', 'wpsc') . "', '0', '0','africa','1');
200	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (199, '" . __('South Africa') ."', 'ZA', '" . __('South African Rand', 'wpsc') . "', '', '', '" . __('ZAR', 'wpsc') . "', '0', '0','africa','1');
201	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (200, '" . __('South Georgia & South Sandwich Islands') ."', 'GS', '" . __('Pound Sterling', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '0','southamerica','1');
202	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (201, '" . __('Spain') ."', 'ES', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
203	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (202, '" . __('Sri Lanka') ."', 'LK', '" . __('Sri Lanka Rupee', 'wpsc') . "', '', '', '" . __('LKR', 'wpsc') . "', '0', '0','asiapacific','1');
204	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (203, '" . __('Sudan') ."', 'SD', '" . __('Sudanese Dinar', 'wpsc') . "', '', '', '" . __('SDD', 'wpsc') . "', '0', '0','asiapacific','1');
205	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (204, '" . __('Suriname') ."', 'SR', '" . __('Surinam Guilder', 'wpsc') . "', '', '', '" . __('SRG', 'wpsc') . "', '0', '0','southamerica','1');
206	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (205, '" . __('Svalbard and Jan Mayen Islands') ."', 'SJ', '" . __('Norwegian Krone', 'wpsc') . "', '', '', '" . __('NOK', 'wpsc') . "', '0', '0','','1');
207	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (206, '" . __('Swaziland') ."', 'SZ', '" . __('Swaziland Lilangeni', 'wpsc') . "', '', '', '" . __('SZL', 'wpsc') . "', '0', '0','europe','1');
208	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (207, '" . __('Sweden') ."', 'SE', '" . __('Swedish Krona', 'wpsc') . "', '', '', '" . __('SEK', 'wpsc') . "', '0', '0','europe','1');
209	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (208, '" . __('Switzerland') ."', 'CH', '" . __('Swiss Franc', 'wpsc') . "', '', '', '" . __('CHF', 'wpsc') . "', '0', '0','europe','1');
210	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (209, '" . __('Syria') ."', 'SY', '" . __('Syrian Pound', 'wpsc') . "', '', '', '" . __('SYP', 'wpsc') . "', '0', '0','europe','1');
211	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (210, '" . __('Taiwan') ."', 'TW', '" . __('Taiwan Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('TWD', 'wpsc') . "', '0', '0','asiapacific','1');
212	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (211, '" . __('Tajikistan') ."', 'TJ', '" . __('Tajik Ruble', 'wpsc') . "', '', '', '" . __('TJR', 'wpsc') . "', '0', '0','asiapacific','1');
213	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (212, '" . __('Tanzania') ."', 'TZ', '" . __('Tanzanian Shilling', 'wpsc') . "', '', '', '" . __('TZS', 'wpsc') . "', '0', '0','africa','1');
214	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (213, '" . __('Thailand') ."', 'TH', '" . __('Thai Baht', 'wpsc') . "', '', '', '" . __('THB', 'wpsc') . "', '0', '0','asiapacific','1');
215	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (214, '" . __('Togo') ."', 'TG', '" . __('CFA Franc BCEAO', 'wpsc') . "', '', '', '" . __('XOF', 'wpsc') . "', '0', '0','africa','1');
216	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (215, '" . __('Tokelau') ."', 'TK', '" . __('New Zealand Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('NZD', 'wpsc') . "', '0', '0','asiapacific','1');
217	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (216, '" . __('Tonga') ."', 'TO', '" . __('Tongan Paʻanga', 'wpsc') . "', '', '', '" . __('TOP', 'wpsc') . "', '0', '0','asiapacific','1');
218	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (217, '" . __('Trinidad and Tobago') ."', 'TT', '" . __('Trinidad and Tobago Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('TTD', 'wpsc') . "', '0', '0','africa','1');
219	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (218, '" . __('Tunisia') ."', 'TN', '" . __('Tunisian Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('TND', 'wpsc') . "', '0', '0','africa','1');
220	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (219, '" . __('Turkey') ."', 'TR', '" . __('Turkish Lira', 'wpsc') . "', '', '', '" . __('TRL', 'wpsc') . "', '0', '0','asiapacific','1');
221	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (220, '" . __('Turkmenistan') ."', 'TM', '" . __('Manat', 'wpsc') . "', '', '', '" . __('TMM', 'wpsc') . "', '0', '0','asiapacific','1');
222	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (221, '" . __('Turks and Caicos Islands') ."', 'TC', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0', 'northamerica','1');
223	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (222, '" . __('Tuvalu') ."', 'TV', '" . __('Australian Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('AUD', 'wpsc') . "', '0', '0','asiapacific','1');
224	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (223, '" . __('U.K.') ."', 'UK', '" . __('Pound Sterling', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('£', 'wpsc') . "', '" . __('GBP', 'wpsc') . "', '0', '17.5','europe','1');
225	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (224, '" . __('Uganda') ."', 'UG', '" . __('Uganda Shilling', 'wpsc') . "', '', '', '" . __('UGS', 'wpsc') . "', '0', '0','africa','1');
226	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (225, '" . __('Ukraine') ."', 'UA', '" . __('Ukraine Hryvnia', 'wpsc') . "', '', '', '" . __('UAG', 'wpsc') . "', '0', '0','europe','1');
227	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (226, '" . __('United Arab Emirates') ."', 'AE', '" . __('Arab Emirates Dirham', 'wpsc') . "', '', '', '" . __('AED', 'wpsc') . "', '0', '0','asiapacific','1');
228	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (227, '" . __('Uruguay') ."', 'UY', '" . __('Uruguayan Peso') . "', '', '', '" . __('UYP', 'wpsc') . "', '0', '0','southamerica','1');
229	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (228, '" . __('USA Minor Outlying Islands') ."', 'UM', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','','1');
230	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (229, '" . __('Uzbekistan') ."', 'UZ', '" . __('Uzbekistan Sum', 'wpsc') . "', '', '', '" . __('UZS', 'wpsc') . "', '0', '0','asiapacific','1');
231	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (230, '" . __('Vanuatu') ."', 'VU', '" . __('Vanuatu Vatu', 'wpsc') . "', '', '', '" . __('VUV', 'wpsc') . "', '0', '0','asiapacific','1');
232	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (231, '" . __('Vatican') ."', 'VA', '" . __('Euro', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('€', 'wpsc') . "', '" . __('EUR', 'wpsc') . "', '0', '0','europe','1');
233	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (232, '" . __('Venezuela') ."', 'VE', '" . __('Venezuelan Bolivar', 'wpsc') . "', '', '', '" . __('VUB', 'wpsc') . "', '0', '0','asiapacific','1');
234	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (233, '" . __('Vietnam') ."', 'VN', '" . __('Vietnamese Dong', 'wpsc') . "', '', '', '" . __('VND', 'wpsc') . "', '0', '0','asiapacific','1');
235	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (234, '" . __('Virgin Islands (British)') ."', 'VG', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','northamerica','1');
236	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (235, '" . __('Virgin Islands (USA)') ."', 'VI', '" . __('US Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('USD', 'wpsc') . "', '0', '0','northamerica','1');
237	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (236, '" . __('Wallis and Futuna Islands') ."', 'WF', '" . __('CFP Franc', 'wpsc') . "', '', '', '" . __('XPF', 'wpsc') . "', '0', '0','asiapacific','1');
238	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (237, '" . __('Western Sahara') ."', 'EH', '" . __('Moroccan Dirham', 'wpsc') . "', '', '', '" . __('MAD', 'wpsc') . "', '0', '0','africa','1');
239	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (238, '" . __('Yemen') ."', 'YE', '" . __('Yemeni Rial', 'wpsc') . "', '', '', '" . __('YER', 'wpsc') . "', '0', '0','asiapacific','1');
240	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (239, '" . __('Yugoslavia') ."', 'YU', '" . __('Yugoslav New Dinar', 'wpsc') . "', '', '', '" . __('YUN', 'wpsc') . "', '0', '0','europe','1');
241	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (240, '" . __('Zambia') ."', 'ZM', '" . __('Zambian Kwacha', 'wpsc') . "', '', '', '" . __('ZMK', 'wpsc') . "', '0', '0','africa','1');
242	+ INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (241, '" . __('Zimbabwe') ."', 'ZW', '" . __('Zimbabwe Dollar', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('$', 'wpsc') . "', '" . __('ZWD', 'wpsc') . "', '0', '0','africa','1');"; ?>

wpsc-widgets/admin_menu_widget.php CHANGED Viewed

	@@ -13,7 +13,6 @@ class WP_Widget_Admin_Menu extends WP_Widget {
13	* Widget Constuctor
14	*/
15	function WP_Widget_Admin_Menu() {
16	-
17	$widget_ops = array(
18	'classname' => 'widget_wpsc_admin_menu',
19	'description' => __( 'Admin Menu Widget', 'wpsc' )
	@@ -39,7 +38,7 @@ class WP_Widget_Admin_Menu extends WP_Widget {
39
40	if ( current_user_can( 'manage_options' ) ) {
41	echo $before_widget;
42	- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Admin Menu' ) : $instance['title'] );
43	if ( $title ) {
44	echo $before_title . $title . $after_title;
45	}
	@@ -60,7 +59,7 @@ class WP_Widget_Admin_Menu extends WP_Widget {
60	function update( $new_instance, $old_instance ) {
61
62	$instance = $old_instance;
63	- $instance['title'] = strip_tags( $new_instance['title'] );
64
65	return $instance;
66
	@@ -83,7 +82,7 @@ class WP_Widget_Admin_Menu extends WP_Widget {
83
84	?>
85	<p>
86	- <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
87	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
88	</p>
89	<?php


13	* Widget Constuctor
14	*/
15	function WP_Widget_Admin_Menu() {

16	$widget_ops = array(
17	'classname' => 'widget_wpsc_admin_menu',
18	'description' => __( 'Admin Menu Widget', 'wpsc' )

38
39	if ( current_user_can( 'manage_options' ) ) {
40	echo $before_widget;
41	+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Admin Menu', 'wpsc' ) : $instance['title'] );
42	if ( $title ) {
43	echo $before_title . $title . $after_title;
44	}

59	function update( $new_instance, $old_instance ) {
60
61	$instance = $old_instance;
62	+ $instance['title'] = esc_attr( strip_tags( $new_instance['title'] ) );
63
64	return $instance;
65

82
83	?>
84	<p>
85	+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'wpsc' ); ?></label>
86	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
87	</p>
88	<?php

wpsc-widgets/category_widget.php CHANGED Viewed

	@@ -31,7 +31,7 @@ class WP_Widget_Product_Categories extends WP_Widget {
31
32	extract( $args );
33
34	- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Product Categories' ) : $instance['title'] );
35
36	echo $before_widget;
37
	@@ -125,7 +125,7 @@ class WP_Widget_Product_Categories extends WP_Widget {
125	?>
126
127	<p>
128	- <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
129	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
130	</p>
131


31
32	extract( $args );
33
34	+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Product Categories', 'wpsc' ) : $instance['title'] );
35
36	echo $before_widget;
37

125	?>
126
127	<p>
128	+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'wpsc' ); ?></label>
129	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
130	</p>
131

wpsc-widgets/donations_widget.php CHANGED Viewed

	@@ -46,7 +46,7 @@ class WP_Widget_Donations extends WP_Widget {
46
47	if ( $donation_count > 0 ) {
48	echo $before_widget;
49	- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Product Donations' ) : $instance['title'] );
50	if ( $title ) {
51	echo $before_title . $title . $after_title;
52	}
	@@ -92,7 +92,7 @@ class WP_Widget_Donations extends WP_Widget {
92
93	?>
94	<p>
95	- <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
96	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
97	</p>
98	<?php
	@@ -146,7 +146,7 @@ function wpsc_donations( $args = null ) {
146	$attached_image = $attached_images[0];
147	$output .= "<div class='wpsc_product_donation'>";
148	if ( ( $attached_image->ID > 0 ) ) {
149	- $output .= "<img src='" . wpsc_product_image( $attached_image->ID, get_option( 'product_image_width' ), get_option( 'product_image_height' ) ) . "' title='" . $product['post_title'] . "' alt='" . $product['post_title'] . "' /><br />";
150	}
151
152	// Get currency options
	@@ -161,7 +161,7 @@ function wpsc_donations( $args = null ) {
161	$output .= "<input type='hidden' name='product_id' value='" . $product['ID'] . "'/>";
162	$output .= "<input type='hidden' name='item' value='" . $product['ID'] . "' />";
163	$output .= "<input type='hidden' name='wpsc_ajax_action' value='add_to_cart' />";
164	- $output .= "<label for='donation_widget_price_" . $product['ID'] . "'>" . __( 'Donation', 'wpsc' ) . ":</label> $currency_symbol<input type='text' id='donation_widget_price_" . $product['ID'] . "' name='donation_price' value='" . number_format( $price, 2 ) . "' size='6' /><br />";
165	$output .= "<input type='submit' name='Buy' class='wpsc_buy_button' value='" . __( 'Add To Cart', 'wpsc' ) . "' />";
166	$output .= "</form>";
167	$output .= "</div>";


46
47	if ( $donation_count > 0 ) {
48	echo $before_widget;
49	+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Product Donations', 'wpsc' ) : $instance['title'] );
50	if ( $title ) {
51	echo $before_title . $title . $after_title;
52	}

92
93	?>
94	<p>
95	+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'wpsc' ); ?></label>
96	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
97	</p>
98	<?php

146	$attached_image = $attached_images[0];
147	$output .= "<div class='wpsc_product_donation'>";
148	if ( ( $attached_image->ID > 0 ) ) {
149	+ $output .= "<img src='" . wpsc_product_image( $attached_image->ID, get_option( 'product_image_width' ), get_option( 'product_image_height' ) ) . "' title='" . $product['post_title'] . "' alt='" . esc_attr( $product['post_title'] ) . "' /><br />";
150	}
151
152	// Get currency options

161	$output .= "<input type='hidden' name='product_id' value='" . $product['ID'] . "'/>";
162	$output .= "<input type='hidden' name='item' value='" . $product['ID'] . "' />";
163	$output .= "<input type='hidden' name='wpsc_ajax_action' value='add_to_cart' />";
164	+ $output .= "<label for='donation_widget_price_" . $product['ID'] . "'>" . __( 'Donation', 'wpsc' ) . ":</label> $currency_symbol<input type='text' id='donation_widget_price_" . $product['ID'] . "' name='donation_price' value='" . esc_attr( number_format( $price, 2 ) ) . "' size='6' /><br />";
165	$output .= "<input type='submit' name='Buy' class='wpsc_buy_button' value='" . __( 'Add To Cart', 'wpsc' ) . "' />";
166	$output .= "</form>";
167	$output .= "</div>";

wpsc-widgets/latest_product_widget.php CHANGED Viewed

	@@ -28,7 +28,7 @@ class WP_Widget_Latest_Products extends WP_Widget {
28
29	extract( $args );
30
31	- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Latest Products' ) : $instance['title'] );
32
33	echo $before_widget;
34
	@@ -84,7 +84,7 @@ class WP_Widget_Latest_Products extends WP_Widget {
84	$height = (int) $instance['height']; ?>
85
86	<p>
87	- <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
88	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
89	</p>
90


28
29	extract( $args );
30
31	+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Latest Products', 'wpsc' ) : $instance['title'] );
32
33	echo $before_widget;
34

84	$height = (int) $instance['height']; ?>
85
86	<p>
87	+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'wpsc' ); ?></label>
88	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
89	</p>
90

wpsc-widgets/price_range_widget.php CHANGED Viewed

	@@ -38,7 +38,7 @@ class WP_Widget_Price_Range extends WP_Widget {
38	extract( $args );
39
40	echo $before_widget;
41	- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Price Range' ) : $instance['title'] );
42	if ( $title ) {
43	echo $before_title . $title . $after_title;
44	}
	@@ -81,7 +81,7 @@ class WP_Widget_Price_Range extends WP_Widget {
81
82	?>
83	<p>
84	- <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
85	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
86	</p>
87	<?php


38	extract( $args );
39
40	echo $before_widget;
41	+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Price Range', 'wpsc' ) : $instance['title'] );
42	if ( $title ) {
43	echo $before_title . $title . $after_title;
44	}

81
82	?>
83	<p>
84	+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'wpsc' ); ?></label>
85	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
86	</p>
87	<?php

wpsc-widgets/product_tag_widget.php CHANGED Viewed

	@@ -38,7 +38,7 @@ class WP_Widget_Product_Tags extends WP_Widget {
38	extract( $args );
39
40	echo $before_widget;
41	- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Product Tags' ) : $instance['title'] );
42	if ( $title ) {
43	echo $before_title . $title . $after_title;
44	}
	@@ -81,7 +81,7 @@ class WP_Widget_Product_Tags extends WP_Widget {
81
82	?>
83	<p>
84	- <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
85	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
86	</p>
87	<?php


38	extract( $args );
39
40	echo $before_widget;
41	+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Product Tags', 'wpsc' ) : $instance['title'] );
42	if ( $title ) {
43	echo $before_title . $title . $after_title;
44	}

81
82	?>
83	<p>
84	+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'wpsc' ); ?></label>
85	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
86	</p>
87	<?php

wpsc-widgets/shopping_cart_widget.php CHANGED Viewed

	@@ -57,7 +57,7 @@ class WP_Widget_Shopping_Cart extends WP_Widget {
57	}
58
59	// Start widget output
60	- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Shopping Cart' ) : $instance['title'] );
61	echo $before_widget;
62
63	if ( $title )
	@@ -134,13 +134,13 @@ class WP_Widget_Shopping_Cart extends WP_Widget {
134	$show_sliding_cart = '';
135	?>
136	<p>
137	- <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
138	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
139	</p>
140	<input type='hidden' name="<?php echo $this->get_field_name( 'show_sliding_cart' ); ?>" value='0' />
141	<p>
142
143	- <label for="<?php echo $this->get_field_id('show_sliding_cart'); ?>"><?php _e( 'Use Sliding Cart:' ); ?></label>
144	<input id="<?php echo $this->get_field_id( 'show_sliding_cart' ); ?>" name="<?php echo $this->get_field_name( 'show_sliding_cart' ); ?>" type="checkbox" value="1" <?php echo $show_sliding_cart; ?> />
145	</p>
146


57	}
58
59	// Start widget output
60	+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Shopping Cart', 'wpsc' ) : $instance['title'] );
61	echo $before_widget;
62
63	if ( $title )

134	$show_sliding_cart = '';
135	?>
136	<p>
137	+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'wpsc' ); ?></label>
138	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
139	</p>
140	<input type='hidden' name="<?php echo $this->get_field_name( 'show_sliding_cart' ); ?>" value='0' />
141	<p>
142
143	+ <label for="<?php echo $this->get_field_id('show_sliding_cart'); ?>"><?php _e( 'Use Sliding Cart:', 'wpsc' ); ?></label>
144	<input id="<?php echo $this->get_field_id( 'show_sliding_cart' ); ?>" name="<?php echo $this->get_field_name( 'show_sliding_cart' ); ?>" type="checkbox" value="1" <?php echo $show_sliding_cart; ?> />
145	</p>
146

wpsc-widgets/specials_widget.php CHANGED Viewed

	@@ -38,7 +38,7 @@ class WP_Widget_Product_Specials extends WP_Widget {
38	extract( $args );
39
40	echo $before_widget;
41	- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Product Specials' ) : $instance['title'] );
42	if ( $title )
43	echo $before_title . $title . $after_title;
44
	@@ -92,7 +92,7 @@ class WP_Widget_Product_Specials extends WP_Widget {
92
93	?>
94	<p>
95	- <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
96	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
97	</p>
98	<p>
	@@ -169,7 +169,7 @@ function wpsc_specials( $args = null, $instance ) {
169	</a>
170	<?php else: ?>
171	<a href="<?php echo wpsc_the_product_permalink(); ?>">
172	- <img class="no-image" id="product_image_<?php echo wpsc_the_product_id(); ?>" alt="No Image" title="<?php echo wpsc_the_product_title(); ?>" src="<?php echo WPSC_URL; ?>/wpsc-theme/wpsc-images/noimage.png" width="<?php ~~echo~~ get_option('product_image_width'); ?>" height="<?php ~~echo~~ get_option('product_image_height'); ?>" />
173	</a>
174	<?php endif; ?>
175	<br />


38	extract( $args );
39
40	echo $before_widget;
41	+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Product Specials', 'wpsc' ) : $instance['title'] );
42	if ( $title )
43	echo $before_title . $title . $after_title;
44

92
93	?>
94	<p>
95	+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'wpsc' ); ?></label>
96	<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
97	</p>
98	<p>

169	</a>
170	<?php else: ?>
171	<a href="<?php echo wpsc_the_product_permalink(); ?>">
172	+ <img class="no-image" id="product_image_<?php echo wpsc_the_product_id(); ?>" alt="No Image" title="<?php echo wpsc_the_product_title(); ?>" src="<?php echo WPSC_URL; ?>/wpsc-theme/wpsc-images/noimage.png" width="<?php esc_attr_e( get_option('product_image_width') ); ?>" height="<?php esc_attr_e( get_option('product_image_height') ); ?>" />
173	</a>
174	<?php endif; ?>
175	<br />

wpsc-widgets/tagging_functions.php CHANGED Viewed

	@@ -91,7 +91,7 @@ function wp_generate_product_tag_cloud( $tags, $args = '' ) {
91	$tag_id = $tag_ids[$tag];
92	$tag_link = esc_url( $tag_links[$tag] );
93	$tag = str_replace( ' ', ' ', esc_html( $tag ) );
94	- $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( sprintf( __( '%d topics' ), $count ) ) . "'$rel style='font-size: " .
95	( $smallest + ( ( $count - $min_count ) * $font_step ) )
96	. "$unit;'>$tag</a>";
97	}


91	$tag_id = $tag_ids[$tag];
92	$tag_link = esc_url( $tag_links[$tag] );
93	$tag = str_replace( ' ', ' ', esc_html( $tag ) );
94	+ $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( sprintf( _n( '%d topic', '%d topics', $count, 'wpsc' ), $count ) ) . "'$rel style='font-size: " .
95	( $smallest + ( ( $count - $min_count ) * $font_step ) )
96	. "$unit;'>$tag</a>";
97	}