Permalink
Browse files

update to version 1.3.2

  • Loading branch information...
1 parent 76027c9 commit 94ae598318d241df1a8ad5dbcfa3dbaded7200c1 @divergeinfinity divergeinfinity committed Aug 29, 2012
Showing with 14,962 additions and 7,728 deletions.
  1. +2 −2 admin/jigoshop-admin-post-types.php
  2. +12 −2 admin/jigoshop-admin-settings-api.php
  3. +20 −7 admin/jigoshop-install.php
  4. +1 −1 admin/write-panels/order-data.php
  5. +140 −138 admin/write-panels/product-data.php
  6. +1,243 −2 assets/css/frontend.css
  7. +1 −1 assets/css/frontend.less
  8. +5 −8 assets/css/select2.css
  9. +138 −139 assets/js/script.js
  10. +190 −37 assets/js/select2.js
  11. +65 −62 assets/js/select2.min.js
  12. +14 −14 classes/jigoshop_cron.class.php
  13. +18 −5 classes/jigoshop_forms.class.php
  14. +24 −23 classes/jigoshop_options.class.php
  15. +15 −35 classes/jigoshop_order.class.php
  16. +0 −35 classes/jigoshop_product.class.php
  17. +30 −0 gateways/bank_transfer.php
  18. +24 −20 jigoshop.php
  19. +152 −152 jigoshop_actions.php
  20. +1 −1 jigoshop_emails.php
  21. +3 −3 jigoshop_template_functions.php
  22. BIN languages/jigoshop-da_DK.mo
  23. +4,959 −2,197 languages/jigoshop-da_DK.po
  24. BIN languages/jigoshop-de_DE.mo
  25. +3,763 −2,070 languages/jigoshop-de_DE.po
  26. +1,039 −976 languages/jigoshop-en_GB.po
  27. BIN languages/jigoshop-es_ES.mo
  28. +1,986 −760 languages/jigoshop-es_ES.po
  29. +2 −2 languages/jigoshop-fr_FR.po
  30. +1 −1 languages/jigoshop-hu_HU.po
  31. +1 −1 languages/jigoshop-nb_NO.po
  32. +1 −1 languages/jigoshop-nl_NL.po
  33. +1 −1 languages/jigoshop-pl_PL.po
  34. +1 −1 languages/jigoshop-pt_BR.po
  35. +1 −1 languages/jigoshop-pt_PT.po
  36. +1 −1 languages/jigoshop-ro_RO.po
  37. +1 −1 languages/jigoshop-ru_RU.po
  38. +1 −1 languages/jigoshop-sv_SE.po
  39. +1 −1 languages/jigoshop-tr_TR.po
  40. +1,071 −1,015 languages/jigoshop.pot
  41. +22 −2 readme.txt
  42. +1 −1 shipping/shipping_method.class.php
  43. +6 −6 shortcodes/order_tracking.php
  44. +1 −1 templates/single-product-reviews.php
  45. +3 −0 uninstall.php
  46. +1 −1 version.txt
@@ -134,7 +134,7 @@ function jigoshop_custom_product_columns($column) {
}
break;
case "product-type" :
- echo ucwords($product->product_type);
+ echo __(ucwords($product->product_type), 'jigoshop');
echo '<br/>';
if ( $jigoshop_options->get_option('jigoshop_enable_sku', true) == 'yes' && $sku = get_post_meta( $post->ID, 'sku', true )) {
echo $sku;
@@ -263,7 +263,7 @@ function jigoshop_filter_products_type() {
echo "<option value='0'>" . __('Show all types', 'jigoshop') . "</option>";
foreach($terms as $term) {
- echo "<option value='" . esc_attr( $term->slug ) . "' ".selected($term->slug, isset($wp_query->query['product_type']) ? $wp_query->query['product_type'] : '', false).">".esc_html( ucfirst($term->name) )." (".absint( $term->count ).")</option>";
+ echo "<option value='" . esc_attr( $term->slug ) . "' ".selected($term->slug, isset($wp_query->query['product_type']) ? $wp_query->query['product_type'] : '', false).">".__(esc_html( ucfirst($term->name) ), 'jigoshop')." (".absint( $term->count ).")</option>";
}
echo "</select>";
@@ -49,7 +49,7 @@ public function settings_scripts() {
wp_register_script( 'jigoshop-bootstrap-tooltip', jigoshop::assets_url() . '/assets/js/bootstrap-tooltip.min.js', array( 'jquery' ), '2.0.3' );
wp_enqueue_script( 'jigoshop-bootstrap-tooltip' );
- wp_register_script( 'jigoshop-select2', jigoshop::assets_url() . '/assets/js/select2.min.js', array( 'jquery' ), '3.0' );
+ wp_register_script( 'jigoshop-select2', jigoshop::assets_url() . '/assets/js/select2.min.js', array( 'jquery' ), '3.1' );
wp_enqueue_script( 'jigoshop-select2' );
}
@@ -62,7 +62,7 @@ public function settings_scripts() {
*/
public function settings_styles() {
- wp_register_style( 'jigoshop-select2', jigoshop::assets_url() . '/assets/css/select2.css', '', '2.1', 'screen' );
+ wp_register_style( 'jigoshop-select2', jigoshop::assets_url() . '/assets/css/select2.css', '', '3.1', 'screen' );
wp_enqueue_style( 'jigoshop-select2' );
do_action( 'jigoshop_settings_styles' ); // user defined stylesheets should be registered and queued
@@ -884,6 +884,16 @@ class="button '.$class.'"
break;
case 'decimal': // decimal numbers are positive or negative 0-9 inclusive, may include decimal
+ $display .= '<input
+ id="'.$item['id'].'"
+ class="jigoshop-input jigoshop-text '.$class.'"
+ name="'.JIGOSHOP_OPTIONS.'['.$item['id'].']"
+ type="number"
+ step="any"
+ size="20"
+ value="'. esc_attr( $data[$item['id']] ).'" />';
+ break;
+
case 'integer': // integer numbers are positive or negative 0-9 inclusive
case 'natural': // natural numbers are positive 0-9 inclusive
$display .= '<input
@@ -212,8 +212,10 @@ function jigoshop_create_single_page( $page_slug, $page_option, $page_data ) {
*/
function jigoshop_tables_install() {
global $wpdb;
-
- //$wpdb->show_errors();
+
+ if ( is_multisite() ) define( 'DIEONDBERROR', true );
+
+ $wpdb->show_errors();
$collate = '';
if($wpdb->supports_collation()) {
@@ -227,24 +229,35 @@ function jigoshop_tables_install() {
`attribute_label` longtext NULL,
`attribute_type` varchar(200) NOT NULL,
PRIMARY KEY id (`attribute_id`)) $collate;";
- $wpdb->query($sql);
-
+ if ( $wpdb->query($sql) === false ) {
+ $wpdb->print_error();
+ wp_die(__('We were not able to create a Jigoshop database table during installation! (jigoshop_attribute_taxonomies)','jigoshop'));
+ }
+
$sql = "CREATE TABLE IF NOT EXISTS ". $wpdb->prefix . "jigoshop_downloadable_product_permissions" ." (
`product_id` mediumint(9) NOT NULL,
`user_email` varchar(200) NOT NULL,
`user_id` mediumint(9) NULL,
`order_key` varchar(200) NOT NULL,
`downloads_remaining` varchar(9) NULL,
PRIMARY KEY id (`product_id`, `order_key`)) $collate;";
- $wpdb->query($sql);
-
+ if ( $wpdb->query($sql) === false ) {
+ $wpdb->print_error();
+ wp_die(__('We were not able to create a Jigoshop database table during installation! (jigoshop_downloadable_product_permissions)','jigoshop'));
+ }
+
$sql = "CREATE TABLE IF NOT EXISTS ". $wpdb->prefix . "jigoshop_termmeta" ." (
`meta_id` bigint(20) NOT NULL AUTO_INCREMENT,
`jigoshop_term_id` bigint(20) NOT NULL,
`meta_key` varchar(255) NULL,
`meta_value` longtext NULL,
PRIMARY KEY id (`meta_id`)) $collate;";
- $wpdb->query($sql);
+ if ( $wpdb->query($sql) === false ) {
+ $wpdb->print_error();
+ wp_die(__('We were not able to create a Jigoshop database table during installation! (jigoshop_termmeta)','jigoshop'));
+ }
+
+ $wpdb->hide_errors();
}
@@ -264,7 +264,7 @@ function jigoshop_order_items_meta_box($post) {
<tbody></tbody>
</table>
</td>-->
- <?php do_action('jigoshop_admin_order_item_values', $_product, $item); ?>
+ <?php do_action('jigoshop_admin_order_item_values', $_product, $item, $post->ID); ?>
<td class="quantity">
<input type="text" name="item_quantity[]" placeholder="<?php _e('Quantity e.g. 2', 'jigoshop'); ?>" value="<?php echo esc_attr( $item['qty'] ); ?>" />
</td>
Oops, something went wrong.

0 comments on commit 94ae598

Please sign in to comment.