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

Merge pull request #4932 from BFTrick/flat-rate-costs-regex 

Comment RegEx in Flat Rate Shipping
This commit is contained in:
Mike Jolley 2014-02-25 10:47:29 +00:00
parent 979e12aaf1 0fd11ad509
commit b16f83804f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
View File

@ -249,7 +249,15 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
$extra_rate['label'] = $this_option[0]; $extra_rate['label'] = $this_option[0];
$this_cost = $this_option[1]; $this_cost = $this_option[1];
if (preg_match('/(\d+\.?\d*)\s*(\+|-)\s*(\d+\.?\d*)\%/', $this_cost, $this_cost_matches)) { $pattern =
'/' . // start regex
'(\d+\.?\d*)' . // capture digits, optionally capture a `.` and more digits
'\s*' . // match whitespace
'(\+|-)' . // capture the operand
'\s*'. // match whitespace
'(\d+\.?\d*)'. // capture digits, optionally capture a `.` and more digits
'\%/'; // match the percent sign & end regex
if ( preg_match( $pattern, $this_cost, $this_cost_matches ) ) {
$this_cost_mathop = $this_cost_matches[2]; $this_cost_mathop = $this_cost_matches[2];
$this_cost_percents = $this_cost_matches[3] / 100; $this_cost_percents = $this_cost_matches[3] / 100;
$this_cost = $this_cost_matches[1]; $this_cost = $this_cost_matches[1];