From: Steve Sutton Date: Mon, 11 Jan 2016 13:30:01 +0000 (-0500) Subject: saving my branch X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c32ee986d01116d0d25c4c5d4ef69a4a4226d258;p=WP-Themes%2Fglmthemes%2Fmountpleasant-theme.git saving my branch --- diff --git a/woocommerce/checkout/add-to-cart/availability.php b/woocommerce/checkout/add-to-cart/availability.php new file mode 100644 index 0000000..926b12b --- /dev/null +++ b/woocommerce/checkout/add-to-cart/availability.php @@ -0,0 +1,18 @@ +get_availability(); +$availability_html = empty( $availability['availability'] ) ? '' : '' . esc_html( $availability['availability'] ) . ''; + +echo apply_filters( 'woocommerce_stock_html', $availability_html, $availability['availability'], $product ); \ No newline at end of file diff --git a/woocommerce/checkout/add-to-cart/button.php b/woocommerce/checkout/add-to-cart/button.php new file mode 100644 index 0000000..e48204b --- /dev/null +++ b/woocommerce/checkout/add-to-cart/button.php @@ -0,0 +1,18 @@ + + + diff --git a/woocommerce/checkout/add-to-cart/deposit.php b/woocommerce/checkout/add-to-cart/deposit.php new file mode 100644 index 0000000..e640114 --- /dev/null +++ b/woocommerce/checkout/add-to-cart/deposit.php @@ -0,0 +1,18 @@ +', 'method="post"', "enctype='multipart/form-data'" ), array( '', '', '' ), ob_get_clean() ); diff --git a/woocommerce/checkout/add-to-cart/grouped.php b/woocommerce/checkout/add-to-cart/grouped.php new file mode 100644 index 0000000..8e24acd --- /dev/null +++ b/woocommerce/checkout/add-to-cart/grouped.php @@ -0,0 +1,17 @@ +', 'method="post"', "enctype='multipart/form-data'" ), array( '', '', '' ), ob_get_clean() ); diff --git a/woocommerce/checkout/add-to-cart/opc.php b/woocommerce/checkout/add-to-cart/opc.php new file mode 100644 index 0000000..c751c91 --- /dev/null +++ b/woocommerce/checkout/add-to-cart/opc.php @@ -0,0 +1,26 @@ +is_in_stock() ) { + + if ( $product->is_sold_individually() ) { + wc_get_template( 'checkout/add-to-cart/button.php', array( 'product' => $product ), '', PP_One_Page_Checkout::$template_path ); + } else { + wc_get_template( 'checkout/add-to-cart/quantity-input.php', array( 'product' => $product ), '', PP_One_Page_Checkout::$template_path ); + } + +} else { + + wc_get_template( 'checkout/add-to-cart/availability.php', array( 'product' => $product ), '', PP_One_Page_Checkout::$template_path ); + +} ?> + diff --git a/woocommerce/checkout/add-to-cart/quantity-input.php b/woocommerce/checkout/add-to-cart/quantity-input.php new file mode 100644 index 0000000..c2621c1 --- /dev/null +++ b/woocommerce/checkout/add-to-cart/quantity-input.php @@ -0,0 +1,21 @@ + 'product_id', + 'input_value' => ! empty( $product->cart_item['quantity'] ) ? $product->cart_item['quantity'] : 0, + 'max_value' => $product->backorders_allowed() ? '' : $product->get_stock_quantity(), + 'min_value' => 0, +), $product, false ); +echo str_replace( 'type="number"', 'type="number" data-add_to_cart="' . $product->add_to_cart_id . '"', $input_button ); ?> diff --git a/woocommerce/checkout/add-to-cart/radio.php b/woocommerce/checkout/add-to-cart/radio.php new file mode 100644 index 0000000..0cd6e42 --- /dev/null +++ b/woocommerce/checkout/add-to-cart/radio.php @@ -0,0 +1,15 @@ + + diff --git a/woocommerce/checkout/add-to-cart/simple.php b/woocommerce/checkout/add-to-cart/simple.php new file mode 100644 index 0000000..1668fe0 --- /dev/null +++ b/woocommerce/checkout/add-to-cart/simple.php @@ -0,0 +1,18 @@ +', 'method="post"', "enctype='multipart/form-data'" ), array( '', '', '' ), ob_get_clean() ); diff --git a/woocommerce/checkout/add-to-cart/variable.php b/woocommerce/checkout/add-to-cart/variable.php new file mode 100644 index 0000000..644a8ad --- /dev/null +++ b/woocommerce/checkout/add-to-cart/variable.php @@ -0,0 +1,18 @@ +', 'method="post"', "enctype='multipart/form-data'" ), array( '', '', '' ), ob_get_clean() ); diff --git a/woocommerce/checkout/deprecated/review-order.php b/woocommerce/checkout/deprecated/review-order.php new file mode 100644 index 0000000..7666dca --- /dev/null +++ b/woocommerce/checkout/deprecated/review-order.php @@ -0,0 +1,218 @@ + + +
+ + + + + + + + + + cart->get_cart() as $cart_item_key => $cart_item ) { + $_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key ); + + if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_checkout_cart_item_visible', true, $cart_item, $cart_item_key ) ) { + ?> + + + + + + + + + + + + + + cart->get_coupons( 'cart' ) as $code => $coupon ) : ?> + + + + + + + cart->needs_shipping() && WC()->cart->show_shipping() ) : ?> + + + + + + + + + + cart->get_fees() as $fee ) : ?> + + + + + + + cart->tax_display_cart === 'excl' ) : ?> + + cart->get_tax_totals() as $code => $tax ) : ?> + + + + + + + + + + + + + + cart->get_coupons( 'order' ) as $code => $coupon ) : ?> + + + + + + + + + + + + + + + + +
+ +
+
+
+ ×', esc_url( WC()->cart->get_remove_url( $cart_item_key ) ), __( 'Remove this item', 'wcopc' ) ), $cart_item_key ); ?> +
+
+ get_title(), $cart_item, $cart_item_key ); ?> + cart->get_item_data( $cart_item ); ?> +
+
+ is_sold_individually() ) { + $product_quantity = sprintf( '1 ', $cart_item_key ); + } else { + $product_quantity = woocommerce_quantity_input( array( + 'input_name' => "cart[{$cart_item_key}][qty]", + 'input_value' => $cart_item['quantity'], + 'max_value' => $_product->backorders_allowed() ? '' : $_product->get_stock_quantity(), + 'min_value' => '0' + ), $_product, false ); + } + + echo apply_filters( 'woocommerce_cart_item_quantity', $product_quantity, $cart_item_key ); + ?> +
+ 		+ cart->get_product_subtotal( $_product, $cart_item['quantity'] ), $cart_item, $cart_item_key ); ?> +
name ); ?>
label ); ?>formatted_amount ); ?>
countries->tax_or_vat() ); ?>cart->get_taxes_total() ); ?>
+ + + +
+ cart->needs_payment() ) : ?> +
    + payment_gateways->get_available_payment_gateways(); + if ( ! empty( $available_gateways ) ) { + + // Chosen Method + if ( isset( WC()->session->chosen_payment_method ) && isset( $available_gateways[ WC()->session->chosen_payment_method ] ) ) { + $available_gateways[ WC()->session->chosen_payment_method ]->set_current(); + } elseif ( isset( $available_gateways[ get_option( 'woocommerce_default_gateway' ) ] ) ) { + $available_gateways[ get_option( 'woocommerce_default_gateway' ) ]->set_current(); + } else { + current( $available_gateways )->set_current(); + } + + foreach ( $available_gateways as $gateway ) { + ?> +
  • + chosen, true ); ?> data-order_button_text="order_button_text ); ?>" /> + + has_fields() || $gateway->get_description() ) : + echo '
    chosen ? '' : 'style="display:none;"' ) . '>'; + $gateway->payment_fields(); + echo '
    '; + endif; + ?> +
    • + customer->get_country() ) + $no_gateways_message = __( 'Please fill in your details above to see available payment methods.', 'wcopc' ); + else + $no_gateways_message = __( 'Sorry, it seems that there are no available payment methods for your state. Please contact us if you require assistance or wish to make alternate arrangements.', 'wcopc' ); + + echo '

    ' . apply_filters( 'woocommerce_no_available_payment_methods_message', $no_gateways_message ) . '

    '; + + } + ?> +
+ + +
+ + + + + + + + ' ); + ?> + + 0 && apply_filters( 'woocommerce_checkout_show_terms', true ) ) { + $terms_is_checked = apply_filters( 'woocommerce_terms_is_checked_default', isset( $_POST['terms'] ) ); + ?> +

+ + id="terms" /> +

+ + + + +
+ +
+ +
+ + + +
\ No newline at end of file diff --git a/woocommerce/checkout/pricing-table.php b/woocommerce/checkout/pricing-table.php new file mode 100644 index 0000000..1c26fa6 --- /dev/null +++ b/woocommerce/checkout/pricing-table.php @@ -0,0 +1,76 @@ + + +
+ +
+
+

get_title(); ?>

+
+

get_price_html(); ?>

+
+
+ $product ), '', PP_One_Page_Checkout::$template_path ); ?> +
+
+ + has_attributes() ) : ?> + +
+ + is_type( 'variation' ) ) : ?> + get_variation_attributes() as $attribute_title => $attribute_value ) : ?> +

+

parent->get_attributes() ); ?>

+ + + get_attributes() as $attribute ) : + if ( empty( $attribute['is_visible'] ) || ( $attribute['is_taxonomy'] && ! taxonomy_exists( $attribute['name'] ) ) ) { + continue; + } ?> +

+

id, $attribute['name'], array( 'fields' => 'names' ) ); + foreach ( $values as $attribute_value ) { + echo apply_filters( 'woocommerce_attribute', wpautop( wptexturize( $attribute_value ) ), $attribute, $values ); + } + } else { + // Convert pipes to commas and display values + $values = array_map( 'trim', explode( WC_DELIMITER, $attribute['value'] ) ); + foreach ( $values as $attribute_value ) { + echo apply_filters( 'woocommerce_attribute', wpautop( wptexturize( $attribute_value ) ), $attribute, $values ); + } + } + ?> +

+ + +
+ has_attributes() ?> + + enable_dimensions_display() && ( $product->has_weight() || $product->has_dimensions() ) ) : ?> +
+ has_weight() ) : ?> + +

+

get_weight() . ' ' . esc_attr( get_option( 'woocommerce_weight_unit' ) ); ?>

+ + has_dimensions() ) : ?> + +

+

get_dimensions(); ?>

+ +
+ enable_dimensions_display() ?> +
+ +
+
\ No newline at end of file diff --git a/woocommerce/checkout/product-list.php b/woocommerce/checkout/product-list.php new file mode 100644 index 0000000..01c9623 --- /dev/null +++ b/woocommerce/checkout/product-list.php @@ -0,0 +1,37 @@ + +
    + +
  • + $product ), '', PP_One_Page_Checkout::$template_path );; ?> + get_title(); ?> + is_type( 'variation' ) ) : ?> + get_variation_attributes(), true ) ); ?> + get_variation_attributes(), $product ) ); ?> + + get_attributes(); ?> + + get_attribute( $attribute['name'] ) ); ?> + + + +  —  + is_in_stock() ) { ?> + get_price_html(); ?> + $product ), '', PP_One_Page_Checkout::$template_path ); + } ?> +
    • + +
diff --git a/woocommerce/checkout/product-single.php b/woocommerce/checkout/product-single.php new file mode 100644 index 0000000..60b7f41 --- /dev/null +++ b/woocommerce/checkout/product-single.php @@ -0,0 +1,72 @@ +ID; + +foreach ( $products as $single_product ) : + + $product = $single_product; + $post = $single_product->post; + + ?> +
+ +
> + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ +
+ + + diff --git a/woocommerce/checkout/product-table.php b/woocommerce/checkout/product-table.php new file mode 100644 index 0000000..489d41f --- /dev/null +++ b/woocommerce/checkout/product-table.php @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + +
+ + get_image(); ?> + + + get_title(); ?> + is_type( 'variation' ) ) : ?> + get_variation_attributes(), true ) ); ?> + get_variation_attributes(), $product ) ); ?> + + get_attributes(); ?> + + get_attribute( $attribute['name'] ) ); ?> + + + + + get_price_html(); ?> + + $product ), '', PP_One_Page_Checkout::$template_path ); ?> +
diff --git a/woocommerce/checkout/review-order-opc.php b/woocommerce/checkout/review-order-opc.php new file mode 100644 index 0000000..0e9ea86 --- /dev/null +++ b/woocommerce/checkout/review-order-opc.php @@ -0,0 +1,129 @@ + +
+ + + + + + + + + + cart->get_cart() as $cart_item_key => $cart_item ) { + $_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key ); + + if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_checkout_cart_item_visible', true, $cart_item, $cart_item_key ) ) { + ?> + + + + + + + + + + + + + + cart->get_coupons() as $code => $coupon ) : ?> + + + + + + + cart->needs_shipping() && WC()->cart->show_shipping() ) : ?> + + + + + + + + + + cart->get_fees() as $fee ) : ?> + + + + + + + cart->tax_display_cart === 'excl' ) : ?> + + cart->get_tax_totals() as $code => $tax ) : ?> + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ ×', esc_url( WC()->cart->get_remove_url( $cart_item_key ) ), __( 'Remove this item', 'wcopc' ) ), $cart_item_key ); ?> +
+
+ get_title(), $cart_item, $cart_item_key ); ?> + cart->get_item_data( $cart_item ); ?> +
+
+ is_sold_individually() ) { + $product_quantity = sprintf( '1 ', $cart_item_key ); + } else { + $product_quantity = woocommerce_quantity_input( array( + 'input_name' => "cart[{$cart_item_key}][qty]", + 'input_value' => $cart_item['quantity'], + 'max_value' => $_product->backorders_allowed() ? '' : $_product->get_stock_quantity(), + 'min_value' => '0' + ), $_product, false ); + } + + echo apply_filters( 'woocommerce_cart_item_quantity', $product_quantity, $cart_item_key ); + ?> +
+ 		+ cart->get_product_subtotal( $_product, $cart_item['quantity'] ), $cart_item, $cart_item_key ); ?> +
name ); ?>
label ); ?>formatted_amount ); ?>
countries->tax_or_vat() ); ?>cart->get_taxes_total() ); ?>
+
\ No newline at end of file diff --git a/woocommerce/content-product_cat.php b/woocommerce/content-product_cat.php index 3618534..f044d45 100644 --- a/woocommerce/content-product_cat.php +++ b/woocommerce/content-product_cat.php @@ -6,7 +6,7 @@ * * @author WooThemes * @package WooCommerce/Templates - * @version 1.6.4 + * @version 2.4.0 */ if ( ! defined( 'ABSPATH' ) ) { diff --git a/woocommerce/content-single-product.php b/woocommerce/content-single-product.php new file mode 100644 index 0000000..511b4eb --- /dev/null +++ b/woocommerce/content-single-product.php @@ -0,0 +1,78 @@ + + + + +
> + + + +
+ + + +
+ + + + + +
+ +