From 80ff0f07fd3c1217537469940454b8c6e47d9411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= Date: Sat, 11 Feb 2017 10:39:09 +0100 Subject: [PATCH] revert custom woo commerce integration to default integration --- page.php | 3 +- woocommerce.php | 50 ++++++ woocommerce/archive-product.php | 108 ------------ woocommerce/cart/cart-empty.php | 39 ---- woocommerce/cart/cart.php | 166 ------------------ woocommerce/cart/mini-cart.php | 91 ---------- .../cart/proceed-to-checkout-button.php | 28 --- woocommerce/checkout/form-checkout.php | 67 ------- woocommerce/checkout/form-coupon.php | 44 ----- woocommerce/checkout/form-pay.php | 98 ----------- woocommerce/checkout/payment.php | 60 ------- woocommerce/global/form-login.php | 62 ------- woocommerce/global/quantity-input.php | 25 --- woocommerce/global/wrapper-end.php | 23 --- woocommerce/global/wrapper-start.php | 31 ---- woocommerce/loop/add-to-cart.php | 35 ---- woocommerce/loop/orderby.php | 45 ----- woocommerce/myaccount/downloads.php | 104 ----------- woocommerce/myaccount/form-edit-account.php | 73 -------- woocommerce/myaccount/form-edit-address.php | 55 ------ woocommerce/myaccount/form-login.php | 124 ------------- woocommerce/myaccount/form-lost-password.php | 45 ----- woocommerce/myaccount/form-reset-password.php | 52 ------ woocommerce/myaccount/my-orders.php | 105 ----------- woocommerce/myaccount/navigation.php | 35 ---- woocommerce/myaccount/orders.php | 125 ------------- .../single-product/add-to-cart/simple.php | 65 ------- .../single-product/product-thumbnails.php | 71 -------- woocommerce/single-product/rating.php | 45 ----- woocommerce/single-product/review-rating.php | 32 ---- .../single-product/short-description.php | 32 ---- 31 files changed, 51 insertions(+), 1887 deletions(-) create mode 100644 woocommerce.php delete mode 100755 woocommerce/archive-product.php delete mode 100644 woocommerce/cart/cart-empty.php delete mode 100755 woocommerce/cart/cart.php delete mode 100755 woocommerce/cart/mini-cart.php delete mode 100755 woocommerce/cart/proceed-to-checkout-button.php delete mode 100755 woocommerce/checkout/form-checkout.php delete mode 100755 woocommerce/checkout/form-coupon.php delete mode 100755 woocommerce/checkout/form-pay.php delete mode 100755 woocommerce/checkout/payment.php delete mode 100755 woocommerce/global/form-login.php delete mode 100755 woocommerce/global/quantity-input.php delete mode 100644 woocommerce/global/wrapper-end.php delete mode 100644 woocommerce/global/wrapper-start.php delete mode 100755 woocommerce/loop/add-to-cart.php delete mode 100755 woocommerce/loop/orderby.php delete mode 100755 woocommerce/myaccount/downloads.php delete mode 100755 woocommerce/myaccount/form-edit-account.php delete mode 100755 woocommerce/myaccount/form-edit-address.php delete mode 100755 woocommerce/myaccount/form-login.php delete mode 100755 woocommerce/myaccount/form-lost-password.php delete mode 100755 woocommerce/myaccount/form-reset-password.php delete mode 100755 woocommerce/myaccount/my-orders.php delete mode 100755 woocommerce/myaccount/navigation.php delete mode 100755 woocommerce/myaccount/orders.php delete mode 100755 woocommerce/single-product/add-to-cart/simple.php delete mode 100755 woocommerce/single-product/product-thumbnails.php delete mode 100755 woocommerce/single-product/rating.php delete mode 100755 woocommerce/single-product/review-rating.php delete mode 100755 woocommerce/single-product/short-description.php diff --git a/page.php b/page.php index 09f8055..a3f2518 100644 --- a/page.php +++ b/page.php @@ -48,8 +48,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' ); - - + diff --git a/woocommerce.php b/woocommerce.php new file mode 100644 index 0000000..133bb17 --- /dev/null +++ b/woocommerce.php @@ -0,0 +1,50 @@ + + +
+ +
+ +
+ + + + +
+ + + +
+ +
+ + + + + + + + +
+ +
+ + + + \ No newline at end of file diff --git a/woocommerce/archive-product.php b/woocommerce/archive-product.php deleted file mode 100755 index 6d74fb4..0000000 --- a/woocommerce/archive-product.php +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - woocommerce_product_loop_start( false ), 'after' => woocommerce_product_loop_end( false ) ) ) ) : ?> - - - - - - - - - - diff --git a/woocommerce/cart/cart-empty.php b/woocommerce/cart/cart-empty.php deleted file mode 100644 index 1f495be..0000000 --- a/woocommerce/cart/cart-empty.php +++ /dev/null @@ -1,39 +0,0 @@ - - -

- -

- - - - 0 ) : ?> -

- - - -

- diff --git a/woocommerce/cart/cart.php b/woocommerce/cart/cart.php deleted file mode 100755 index dbc0fca..0000000 --- a/woocommerce/cart/cart.php +++ /dev/null @@ -1,166 +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 ); - $product_id = apply_filters( 'woocommerce_cart_item_product_id', $cart_item['product_id'], $cart_item, $cart_item_key ); - - if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_cart_item_visible', true, $cart_item, $cart_item_key ) ) { - $product_permalink = apply_filters( 'woocommerce_cart_item_permalink', $_product->is_visible() ? $_product->get_permalink( $cart_item ) : '', $cart_item, $cart_item_key ); - ?> - - - - - - - - - - - - - - - - - - - - - -
  
- ×', - esc_url( WC()->cart->get_remove_url( $cart_item_key ) ), - __( 'Remove this item', 'understrap' ), - esc_attr( $product_id ), - esc_attr( $_product->get_sku() ) - ), $cart_item_key ); - ?> - - get_image(), $cart_item, $cart_item_key ); - - if ( ! $product_permalink ) { - echo $thumbnail; - } else { - printf( '%s', esc_url( $product_permalink ), $thumbnail ); - } - ?> - - get_title(), $cart_item, $cart_item_key ) . ' '; - } else { - echo apply_filters( 'woocommerce_cart_item_name', sprintf( '%s', esc_url( $product_permalink ), $_product->get_title() ), $cart_item, $cart_item_key ); - } - - // Meta data. - echo WC()->cart->get_item_data( $cart_item ); - - // Backorder notification. - if ( $_product->backorders_require_notification() && $_product->is_on_backorder( $cart_item['quantity'] ) ) { - echo '

' . esc_html__( 'Available on backorder', 'understrap' ) . '

'; - } - ?> - 		- cart->get_product_price( $_product ), $cart_item, $cart_item_key ); - ?> - - 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_item ); - ?> - - cart->get_product_subtotal( $_product, $cart_item['quantity'] ), $cart_item, $cart_item_key ); - ?> -
- - -
- - - - -
- - - - - - - -
- - - -
- -
- - - -
- - diff --git a/woocommerce/cart/mini-cart.php b/woocommerce/cart/mini-cart.php deleted file mode 100755 index bc8bf13..0000000 --- a/woocommerce/cart/mini-cart.php +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - -cart->is_empty() ) : ?> - -

: cart->get_cart_subtotal(); ?>

- - - -

- - -

- - - - diff --git a/woocommerce/cart/proceed-to-checkout-button.php b/woocommerce/cart/proceed-to-checkout-button.php deleted file mode 100755 index a8065b7..0000000 --- a/woocommerce/cart/proceed-to-checkout-button.php +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/woocommerce/checkout/form-checkout.php b/woocommerce/checkout/form-checkout.php deleted file mode 100755 index f14569f..0000000 --- a/woocommerce/checkout/form-checkout.php +++ /dev/null @@ -1,67 +0,0 @@ -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.', 'understrap' ) ); - return; -} - -?> - -
- - checkout_fields ) > 0 ) : ?> - - - -
-
- -
- -
- -
-
- - - - - -

- - - -
- -
- - - -
- - diff --git a/woocommerce/checkout/form-coupon.php b/woocommerce/checkout/form-coupon.php deleted file mode 100755 index 492153a..0000000 --- a/woocommerce/checkout/form-coupon.php +++ /dev/null @@ -1,44 +0,0 @@ -cart->applied_coupons ) ) { - $info_message = apply_filters( 'woocommerce_checkout_coupon_message', __( 'Have a coupon?', 'understrap' ) . ' ' . __( 'Click here to enter your code', 'understrap' ) . '' ); - wc_print_notice( $info_message, 'notice' ); -} -?> - - diff --git a/woocommerce/checkout/form-pay.php b/woocommerce/checkout/form-pay.php deleted file mode 100755 index 344f374..0000000 --- a/woocommerce/checkout/form-pay.php +++ /dev/null @@ -1,98 +0,0 @@ - -
- - - - - - - - - - - get_items() ) > 0 ) : ?> - get_items() as $item_id => $item ) : ?> - - - - - - - - - - - get_order_item_totals() ) : ?> - - - - - - - - -
- display_item_meta( $item ); - do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order ); - ?> - ' . sprintf( '× %s', esc_html( $item['qty'] ) ) . '', $item ); ?>get_formatted_line_subtotal( $item ); ?>
- -
- needs_payment() ) : ?> -
    - $gateway ) ); - } - } else { - echo '
  • ' . apply_filters( 'woocommerce_no_available_payment_methods_message', __( 'Sorry, it seems that there are no available payment methods for your location. Please contact us if you require assistance or wish to make alternate arrangements.', 'understrap' ) ) . '
    • '; - } - ?> -
- -
- - - - - - - ' ); ?> - - - - -
-
-
diff --git a/woocommerce/checkout/payment.php b/woocommerce/checkout/payment.php deleted file mode 100755 index 7689671..0000000 --- a/woocommerce/checkout/payment.php +++ /dev/null @@ -1,60 +0,0 @@ - -
- cart->needs_payment() ) : ?> - - -
- - - - - - - ' ); ?> - - - - -
-
- -
> - - - - - -

- - -

-

- - -

-
- - - -

- - - - -

-

- -

- -
- - - -
diff --git a/woocommerce/global/quantity-input.php b/woocommerce/global/quantity-input.php deleted file mode 100755 index 29c0b19..0000000 --- a/woocommerce/global/quantity-input.php +++ /dev/null @@ -1,25 +0,0 @@ - -
- -
diff --git a/woocommerce/global/wrapper-end.php b/woocommerce/global/wrapper-end.php deleted file mode 100644 index d788f46..0000000 --- a/woocommerce/global/wrapper-end.php +++ /dev/null @@ -1,23 +0,0 @@ - - diff --git a/woocommerce/global/wrapper-start.php b/woocommerce/global/wrapper-start.php deleted file mode 100644 index cb8a5ff..0000000 --- a/woocommerce/global/wrapper-start.php +++ /dev/null @@ -1,31 +0,0 @@ -
'; -} else { - echo '
'; -} diff --git a/woocommerce/loop/add-to-cart.php b/woocommerce/loop/add-to-cart.php deleted file mode 100755 index a6f9900..0000000 --- a/woocommerce/loop/add-to-cart.php +++ /dev/null @@ -1,35 +0,0 @@ -%s', - esc_url( $product->add_to_cart_url() ), - esc_attr( isset( $quantity ) ? $quantity : 1 ), - esc_attr( $product->id ), - esc_attr( $product->get_sku() ), - // TODO: load add to cart button class from customizer? -// esc_attr( isset( $class ) ? $class : 'button' ), - esc_html( $product->add_to_cart_text() ) - ), - $product ); diff --git a/woocommerce/loop/orderby.php b/woocommerce/loop/orderby.php deleted file mode 100755 index 0edd386..0000000 --- a/woocommerce/loop/orderby.php +++ /dev/null @@ -1,45 +0,0 @@ - -
- - $val ) { - if ( 'orderby' === $key || 'submit' === $key ) { - continue; - } - if ( is_array( $val ) ) { - foreach( $val as $innerVal ) { - echo ''; - } - } else { - echo ''; - } - } - ?> -
diff --git a/woocommerce/myaccount/downloads.php b/woocommerce/myaccount/downloads.php deleted file mode 100755 index 6bfe3cf..0000000 --- a/woocommerce/myaccount/downloads.php +++ /dev/null @@ -1,104 +0,0 @@ -customer->get_downloadable_products(); -$has_downloads = (bool) $downloads; - -do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?> - - - - - - - - - $column_name ) : ?> - - - - - - - $column_name ) : ?> - - - - -
- - - - - - - - - - - - - - - - - - - - array( - 'url' => $download['download_url'], - 'name' => __( 'Download', 'understrap' ) - ) - ); - - if ( $actions = apply_filters( 'woocommerce_account_download_actions', $actions, $download ) ) { - foreach ( $actions as $key => $action ) { - echo '' . esc_html( $action['name'] ) . ''; - } - } - ?> - - -
- - - - -
- - - - -
- - - diff --git a/woocommerce/myaccount/form-edit-account.php b/woocommerce/myaccount/form-edit-account.php deleted file mode 100755 index bf29b67..0000000 --- a/woocommerce/myaccount/form-edit-account.php +++ /dev/null @@ -1,73 +0,0 @@ - - - - - diff --git a/woocommerce/myaccount/form-edit-address.php b/woocommerce/myaccount/form-edit-address.php deleted file mode 100755 index e1314f4..0000000 --- a/woocommerce/myaccount/form-edit-address.php +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -
- -

- - - - $field ) : ?> - - - - - - - -

- - - -

- -
- - - - diff --git a/woocommerce/myaccount/form-login.php b/woocommerce/myaccount/form-login.php deleted file mode 100755 index 3e841da..0000000 --- a/woocommerce/myaccount/form-login.php +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - -
- -
- - - -

- - - - - -
- -
- -

- -
- - - - - -

- - -

- - - -

- - -

- - - -

- - -

- - - - -
- - - - -

- - -

- - - -
- -
- -
- - - diff --git a/woocommerce/myaccount/form-lost-password.php b/woocommerce/myaccount/form-lost-password.php deleted file mode 100755 index 961d6c9..0000000 --- a/woocommerce/myaccount/form-lost-password.php +++ /dev/null @@ -1,45 +0,0 @@ - - -
- -

- -

- - -

- -
- - - -

- - -

- - - -
diff --git a/woocommerce/myaccount/form-reset-password.php b/woocommerce/myaccount/form-reset-password.php deleted file mode 100755 index 878f0d6..0000000 --- a/woocommerce/myaccount/form-reset-password.php +++ /dev/null @@ -1,52 +0,0 @@ - - -
- -

- -

- - -

-

- - -

- - - - -
- - - -

- - -

- - - -
diff --git a/woocommerce/myaccount/my-orders.php b/woocommerce/myaccount/my-orders.php deleted file mode 100755 index b49c50e..0000000 --- a/woocommerce/myaccount/my-orders.php +++ /dev/null @@ -1,105 +0,0 @@ - __( 'Order', 'understrap' ), - 'order-date' => __( 'Date', 'understrap' ), - 'order-status' => __( 'Status', 'understrap' ), - 'order-total' => __( 'Total', 'understrap' ), - 'order-actions' => ' ', -) ); - -$customer_orders = get_posts( apply_filters( 'woocommerce_my_account_my_orders_query', array( - 'numberposts' => $order_count, - 'meta_key' => '_customer_user', - 'meta_value' => get_current_user_id(), - 'post_type' => wc_get_order_types( 'view-orders' ), - 'post_status' => array_keys( wc_get_order_statuses() ) -) ) ); - -if ( $customer_orders ) : ?> - -

- - - - - - $column_name ) : ?> - - - - - - - get_item_count(); - ?> - - $column_name ) : ?> - - - - - - - diff --git a/woocommerce/myaccount/navigation.php b/woocommerce/myaccount/navigation.php deleted file mode 100755 index edb1a7d..0000000 --- a/woocommerce/myaccount/navigation.php +++ /dev/null @@ -1,35 +0,0 @@ - - - - - diff --git a/woocommerce/myaccount/orders.php b/woocommerce/myaccount/orders.php deleted file mode 100755 index b9196dd..0000000 --- a/woocommerce/myaccount/orders.php +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - $column_name ) : ?> - - - - - - - orders as $customer_order ) : - $order = wc_get_order( $customer_order ); - $item_count = $order->get_item_count(); - ?> - - $column_name ) : ?> - - - - - - - - - - max_num_pages ) : ?> -
- - - - - max_num_pages ) ) : ?> - - -
- - - -
- - - - -
- - - diff --git a/woocommerce/single-product/add-to-cart/simple.php b/woocommerce/single-product/add-to-cart/simple.php deleted file mode 100755 index 0e56dd2..0000000 --- a/woocommerce/single-product/add-to-cart/simple.php +++ /dev/null @@ -1,65 +0,0 @@ -is_purchasable() ) { - return; -} - -?> - -get_availability(); - $availability_html = empty( $availability['availability'] ) ? '' : '

' . esc_html( $availability['availability'] ) . '

'; - - echo apply_filters( 'woocommerce_stock_html', $availability_html, $availability['availability'], $product ); -?> - -is_in_stock() ) : ?> - - - -
- - - is_sold_individually() ) { - woocommerce_quantity_input( array( - 'min_value' => apply_filters( 'woocommerce_quantity_input_min', 1, $product ), - 'max_value' => apply_filters( 'woocommerce_quantity_input_max', $product->backorders_allowed() ? '' : $product->get_stock_quantity(), $product ), - 'input_value' => ( isset( $_POST['quantity'] ) ? wc_stock_amount( $_POST['quantity'] ) : 1 ) - ) ); - } - ?> - - - - - - -
- - - - diff --git a/woocommerce/single-product/product-thumbnails.php b/woocommerce/single-product/product-thumbnails.php deleted file mode 100755 index 4d944a3..0000000 --- a/woocommerce/single-product/product-thumbnails.php +++ /dev/null @@ -1,71 +0,0 @@ -get_gallery_attachment_ids(); - -if ( $attachment_ids ) { - $loop = 0; - $columns = apply_filters( 'woocommerce_product_thumbnails_columns', 3 ); - ?> -
%s', - esc_url( $props['url'] ), - esc_attr( $image_class ), - esc_attr( $props['caption'] ), - wp_get_attachment_image( $attachment_id, apply_filters( 'single_product_small_thumbnail_size', 'shop_thumbnail' ), 0, $props ) - ), - $attachment_id, - $post->ID, - esc_attr( $image_class ) - ); - - $loop++; - } - - ?>
- get_rating_count(); -$review_count = $product->get_review_count(); -$average = $product->get_average_rating(); - -if ( $rating_count > 0 ) : ?> - -
-
- - ', '' ); ?> - ' . $rating_count . '' ); ?> - -
- (' . $review_count . '' ); ?>) -
- - diff --git a/woocommerce/single-product/review-rating.php b/woocommerce/single-product/review-rating.php deleted file mode 100755 index 5b15957..0000000 --- a/woocommerce/single-product/review-rating.php +++ /dev/null @@ -1,32 +0,0 @@ -comment_ID, 'rating', true ) ); - -if ( $rating && get_option( 'woocommerce_enable_review_rating' ) === 'yes' ) { ?> - -
- -
- -post_excerpt ) { - return; -} - -?> -
- post_excerpt ) ?> -