From: Steve Sutton Date: Mon, 11 Jan 2016 18:12:13 +0000 (-0500) Subject: update for payment form X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=55e35741b71d0e868520fa1c99d71e464329bbbb;p=WP-Themes%2Fglmthemes%2Fmountpleasant-theme.git update for payment form --- diff --git a/functions.php b/functions.php index cddd90e..882e9b6 100644 --- a/functions.php +++ b/functions.php @@ -463,5 +463,15 @@ add_action('thematic_searchloop', 'mytheme_search_loop'); // return $content; //} //add_filter('the_content', 'custom_content'); +//function woo_custom_cart_button_text(){ + //return __('Continue'); +//} +//add_filter('woocommerce_product_single_add_to_cart_text', 'woo_custom_cart_button_text'); +//function redirect_to_checkout() { + //global $woocommerce; + //$checkout_url = $woocommerce->cart->get_checkout_url(); + //return $checkout_url; +//} +//add_filter ('woocommerce_add_to_cart_redirect', 'redirect_to_checkout'); ?> diff --git a/woocommerce.php b/woocommerce.php index ffb35e8..ec5f1b9 100644 --- a/woocommerce.php +++ b/woocommerce.php @@ -1,18 +1,15 @@
-
-
- -
-
-
-
-
-

Great Lakes Shipwreck Museum

-
-
+
+ +
+
+
+

Life… Is Good… In The Center Of It All

-
+
+ +
@@ -26,14 +23,14 @@

cart->get_cart_total(); ?> for - cart->cart_contents_count, + cart->cart_contents_count, 'woothemes'), $woocommerce->cart->cart_contents_count);?>

log out'; } elseif (!is_user_logged_in()) { @@ -48,13 +45,13 @@
- - + + - - + +
- + - - + + @@ -84,7 +81,7 @@
- +
- + diff --git a/woocommerce/checkout/add-to-cart/availability.php b/woocommerce/checkout/add-to-cart/availability.php deleted file mode 100644 index 926b12b..0000000 --- a/woocommerce/checkout/add-to-cart/availability.php +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index e48204b..0000000 --- a/woocommerce/checkout/add-to-cart/button.php +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/woocommerce/checkout/add-to-cart/deposit.php b/woocommerce/checkout/add-to-cart/deposit.php deleted file mode 100644 index e640114..0000000 --- a/woocommerce/checkout/add-to-cart/deposit.php +++ /dev/null @@ -1,18 +0,0 @@ -', '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 deleted file mode 100644 index 8e24acd..0000000 --- a/woocommerce/checkout/add-to-cart/grouped.php +++ /dev/null @@ -1,17 +0,0 @@ -', '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 deleted file mode 100644 index c751c91..0000000 --- a/woocommerce/checkout/add-to-cart/opc.php +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index c2621c1..0000000 --- a/woocommerce/checkout/add-to-cart/quantity-input.php +++ /dev/null @@ -1,21 +0,0 @@ - '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 deleted file mode 100644 index 0cd6e42..0000000 --- a/woocommerce/checkout/add-to-cart/radio.php +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/woocommerce/checkout/add-to-cart/simple.php b/woocommerce/checkout/add-to-cart/simple.php deleted file mode 100644 index 1668fe0..0000000 --- a/woocommerce/checkout/add-to-cart/simple.php +++ /dev/null @@ -1,18 +0,0 @@ -', '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 deleted file mode 100644 index 644a8ad..0000000 --- a/woocommerce/checkout/add-to-cart/variable.php +++ /dev/null @@ -1,18 +0,0 @@ -', '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 deleted file mode 100644 index 7666dca..0000000 --- a/woocommerce/checkout/deprecated/review-order.php +++ /dev/null @@ -1,218 +0,0 @@ - - -
- - - - - - - - - - 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/form-checkout.php b/woocommerce/checkout/form-checkout.php new file mode 100644 index 0000000..4c2299c --- /dev/null +++ b/woocommerce/checkout/form-checkout.php @@ -0,0 +1,61 @@ +enable_signup && ! $checkout->enable_guest_checkout && ! is_user_logged_in() ) { + echo apply_filters( 'woocommerce_checkout_must_be_logged_in_message', __( 'You must be logged in to checkout.', 'woocommerce' ) ); + return; +} + +// filter hook for include new pages inside the payment method +$get_checkout_url = apply_filters( 'woocommerce_get_checkout_url', WC()->cart->get_checkout_url() ); ?> + +
+ + checkout_fields ) > 0 ) : ?> + + + +
+
+ +
+ +
+ +
+
+ + + +

+ + + + + +
+ +
+ + + +
+ + diff --git a/woocommerce/checkout/pricing-table.php b/woocommerce/checkout/pricing-table.php deleted file mode 100644 index 1c26fa6..0000000 --- a/woocommerce/checkout/pricing-table.php +++ /dev/null @@ -1,76 +0,0 @@ - - -
- -
-
-

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 deleted file mode 100644 index 01c9623..0000000 --- a/woocommerce/checkout/product-list.php +++ /dev/null @@ -1,37 +0,0 @@ - -
    - -
  • - $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 deleted file mode 100644 index 60b7f41..0000000 --- a/woocommerce/checkout/product-single.php +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index 489d41f..0000000 --- a/woocommerce/checkout/product-table.php +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - -
- - 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 deleted file mode 100644 index 0e9ea86..0000000 --- a/woocommerce/checkout/review-order-opc.php +++ /dev/null @@ -1,129 +0,0 @@ - -
- - - - - - - - - - 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/checkout/thankyou.php b/woocommerce/checkout/thankyou.php new file mode 100644 index 0000000..df18a76 --- /dev/null +++ b/woocommerce/checkout/thankyou.php @@ -0,0 +1,69 @@ + + + has_status( 'failed' ) ) : ?> + +

+ +

+ +

+ + + + +

+ + + +

+ +
    +
  • + + get_order_number(); ?> +
    • +
  • + + order_date ) ); ?> +
    • +
  • + + get_formatted_order_total(); ?> +
    • + payment_method_title ) : ?> +
  • + + payment_method_title; ?> +
    • + +
+
+ + + + payment_method, $order->id ); ?> + id ); ?> + + + +

+ + diff --git a/woocommerce/content-product_cat.php b/woocommerce/content-product_cat.php deleted file mode 100644 index f044d45..0000000 --- a/woocommerce/content-product_cat.php +++ /dev/null @@ -1,84 +0,0 @@ -slug, $excludeCats ) ) { - return; -} - - -// Store loop count we're currently on -if ( empty( $woocommerce_loop['loop'] ) ) - $woocommerce_loop['loop'] = 0; - -// Store column count for displaying the grid -if ( empty( $woocommerce_loop['columns'] ) ) - $woocommerce_loop['columns'] = apply_filters( 'loop_shop_columns', 4 ); - -// Increase loop count -$woocommerce_loop['loop']++; -?> - - -count > 0 ) { ?> -
  • - - - - - - - -

    - name; - ?> -

    - - - -     - - - -
    • - diff --git a/woocommerce/content-single-product.php b/woocommerce/content-single-product.php index 511b4eb..8bc78ae 100644 --- a/woocommerce/content-single-product.php +++ b/woocommerce/content-single-product.php @@ -14,21 +14,22 @@ if ( ! defined( 'ABSPATH' ) ) { } ?> - + -
    >
    @@ -68,11 +69,11 @@ if ( ! defined( 'ABSPATH' ) ) { * @hooked woocommerce_upsell_display - 15 * @hooked woocommerce_output_related_products - 20 */ - do_action( 'woocommerce_after_single_product_summary' ); + //do_action( 'woocommerce_after_single_product_summary' ); ?>
    - +