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

Merge branch 'master' of git://github.com/woothemes/woocommerce

This commit is contained in:
Geert De Deckere 2012-01-14 22:08:46 +01:00
parent a47d8681cb 935734655b
commit f0ed4ee8ea
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/shipping/shipping-local-delivery.php
View File

@ -24,7 +24,6 @@ class local_delivery extends woocommerce_shipping_method {
// Define user set variables
$this->enabled = $this->settings['enabled'];
$this->free = $this->settings['free'];
$this->title = $this->settings['title'];
$this->fee = $this->settings['fee'];
$this->type = $this->settings['type'];
@ -89,7 +88,8 @@ class local_delivery extends woocommerce_shipping_method {
function admin_options() {
global $woocommerce; ?>
<h3><?php echo $this->method_title; ?></h3>
<h3><?php echo $this->method_title; ?></h3>
<p><?php _e('Local delivery is a simple shipping method for delivering orders locally.', 'woocommerce'); ?></p>
<table class="form-table">
<?php $this->generate_settings_html(); ?>
</table> <?php

3
classes/shipping/shipping-local-pickup.php
View File

@ -62,7 +62,8 @@ class local_pickup extends woocommerce_shipping_method {
function admin_options() {
global $woocommerce; ?>
<h3><?php echo $this->method_title; ?></h3>
<h3><?php echo $this->method_title; ?></h3>
<p><?php _e('Local pickup is a simple method which allows the customer to pick up their order themselves.', 'woocommerce'); ?></p>
<table class="form-table">
<?php $this->generate_settings_html(); ?>
</table> <?php

1
readme.txt
View File

@ -126,6 +126,7 @@ Yes you can! Join in on our GitHub repository :) https://github.com/woothemes/wo
* Tweaked visibility settings and made them more clear
* If there is limited stock, quantity input plus button won't go higher
* Displaying correct currency symbol (Real of Brazil)
* Added local pickup and local delivery shipping methods (thanks Patrick Garman)
= 1.3.2.1 - 15/12/2011 =
* Category/Ordering fix