Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaked scripts + flat rate

This commit is contained in:
Mike Jolley 2011-12-03 18:37:20 +00:00
parent 8129f6f9e4
commit e9551861a7
3 changed files with 75 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/gateways/gateway-paypal.php
View File

@ -283,7 +283,7 @@ class woocommerce_paypal extends woocommerce_payment_gateway {
' . implode('', $paypal_args_array) . '
<input type="submit" class="button-alt" id="submit_paypal_payment_form" value="'.__('Pay via PayPal', 'woothemes').'" /> <a class="button cancel" href="'.esc_url( $order->get_cancel_order_url() ).'">'.__('Cancel order &amp; restore cart', 'woothemes').'</a>
<script type="text/javascript">
jQuery(function(){
(function($) {
jQuery("body").block(
{
message: "<img src=\"'.esc_url( $woocommerce->plugin_url() ).'/assets/images/ajax-loader.gif\" alt=\"Redirecting...\" style=\"float:left; margin-right: 10px;\" />'.__('Thank you for your order. We are now redirecting you to PayPal to make payment.', 'woothemes').'",
@ -303,7 +303,7 @@ class woocommerce_paypal extends woocommerce_payment_gateway {
}
});
jQuery("#submit_paypal_payment_form").click();
});
})(jQuery);
</script>
</form>';

90
classes/shipping/shipping-flat_rate.php
View File

@ -130,8 +130,14 @@ class flat_rate extends woocommerce_shipping_method {
$found_shipping_classes = array();
// Find shipping class
if (sizeof($woocommerce->cart->get_cart())>0) : foreach ($woocommerce->cart->get_cart() as $item_id => $values) : $found_shipping_classes[] = $values['data']->get_shipping_class(); endforeach; endif;
// Find shipping classes for products in the cart
if (sizeof($woocommerce->cart->get_cart())>0) :
foreach ($woocommerce->cart->get_cart() as $item_id => $values) :
if ( $values['data']->needs_shipping() ) :
$found_shipping_classes[] = $values['data']->get_shipping_class();
endif;
endforeach;
endif;
$found_shipping_classes = array_unique($found_shipping_classes);
@ -172,32 +178,78 @@ class flat_rate extends woocommerce_shipping_method {
elseif ($this->type=='class') :
// Shipping per class
$cost = 0;
$cost = null;
$fee = null;
if (sizeof($this->flat_rates)>0) :
$found_shipping_classes = array();
// Find shipping classes for products in the cart
if (sizeof($woocommerce->cart->get_cart())>0) :
foreach ($woocommerce->cart->get_cart() as $item_id => $values) :
if ( $values['data']->needs_shipping() ) :
$found_shipping_classes[] = $values['data']->get_shipping_class();
endif;
endforeach;
endif;
$found_shipping_classes = array_unique($found_shipping_classes);
// For each found class, add up the costs and fees
foreach ($found_shipping_classes as $shipping_class) :
if (isset($this->flat_rates[$shipping_class])) :
$cost += $this->flat_rates[$shipping_class]['cost'];
$fee += $this->get_fee( $this->flat_rates[$shipping_class]['fee'], $woocommerce->cart->cart_contents_total );
else :
// Class not set so we use default rate
$cost += $this->cost;
$fee += $this->get_fee( $this->fee, $woocommerce->cart->cart_contents_total );
endif;
endforeach;
endif;
// Total
$this->shipping_total = $cost + $fee;
if ( get_option('woocommerce_calc_taxes')=='yes' && $this->tax_status=='taxable' ) :
$rate = $_tax->get_shipping_tax_rate();
if ($rate>0) :
$tax_amount = $_tax->calc_shipping_tax( $this->shipping_total, $rate );
$this->shipping_tax = $this->shipping_tax + $tax_amount;
endif;
endif;
elseif ($this->type=='item') :
// Shipping per item
if (sizeof($woocommerce->cart->get_cart())>0) : foreach ($woocommerce->cart->get_cart() as $item_id => $values) :
$_product = $values['data'];
if ($_product->exists() && $values['quantity']>0) :
if ($values['quantity']>0 && $_product->needs_shipping()) :
$item_shipping_price = ($this->cost + $this->get_fee( $this->fee, $_product->get_price() )) * $values['quantity'];
if (isset($this->flat_rates[$_product->get_shipping_class()])) :
$cost = $this->flat_rates[$shipping_class]['cost'];
$fee = $this->get_fee( $this->flat_rates[$shipping_class]['fee'], $_product->get_price() );
else :
$cost = $this->cost;
$fee = $this->get_fee( $this->fee, $_product->get_price() );
endif;
// Only count 'psysical' products
if ( $_product->needs_shipping() ) :
$item_shipping_price = ( $cost + $fee ) * $values['quantity'];
$this->shipping_total = $this->shipping_total + $item_shipping_price;
$this->shipping_total = $this->shipping_total + $item_shipping_price;
if ( $_product->is_shipping_taxable() && $this->tax_status=='taxable' ) :
if ( $_product->is_shipping_taxable() && $this->tax_status=='taxable' ) :
$rate = $_tax->get_shipping_tax_rate( $_product->get_tax_class() );
$rate = $_tax->get_shipping_tax_rate( $_product->get_tax_class() );
if ($rate>0) :
$tax_amount = $_tax->calc_shipping_tax( $item_shipping_price, $rate );
$this->shipping_tax = $this->shipping_tax + $tax_amount;
endif;
if ($rate>0) :
$tax_amount = $_tax->calc_shipping_tax( $item_shipping_price, $rate );
$this->shipping_tax = $this->shipping_tax + $tax_amount;
endif;

4
widgets/widget-login.php
View File

@ -104,7 +104,7 @@ class WooCommerce_Widget_Login extends WP_Widget {
</form>
<script type="text/javascript">
jQuery(function(){
(function($) {
// Ajax Login
jQuery('.widget_login form').submit(function(){
@ -139,7 +139,7 @@ class WooCommerce_Widget_Login extends WP_Widget {
return false;
});
});
})(jQuery);
</script>
<?php
do_action('woocommerce_login_widget_logged_out_after_form');