Geert De Deckere
7b943ecfb8
Merge branch 'master' of git://github.com/woothemes/woocommerce
...
Conflicts:
woocommerce-ajax.php
2012-01-22 10:18:00 +01:00
Mike Jolley
2e60d61197
Merge pull request #520 from patrickgarman/master
...
Default function admin_options() with settings fields
2012-01-21 18:43:15 -08:00
Mike Jolley
e71d1b8034
Changed order item rows - see extended desc
...
Changed rows so we no longer store unit price. There were too many
rounding issues with inc. tax prices with the previous method. Now we
simply store line price - a subtotal which is before discounts, and a
total which is after discounts.
2012-01-22 02:39:21 +00:00
Mike Jolley
a40e5f2bb7
Calculation prompt strings
2012-01-22 02:37:11 +00:00
Mike Jolley
aa9f4385c8
Order items styling
2012-01-22 02:36:59 +00:00
Mike Jolley
c0b6791944
Javascript for order total calculations
2012-01-22 02:36:46 +00:00
Mike Jolley
f9030e85d0
Order item row storage
2012-01-22 02:36:26 +00:00
Mike Jolley
c14d2d5132
Renamed variables and functions for new item rows
2012-01-22 02:36:10 +00:00
Mike Jolley
a25c098bf0
Removed rounding argument as it does nothing
2012-01-22 02:35:46 +00:00
Mike Jolley
ad30381ba3
Changed functions in order total rows - renamed to make more sense
2012-01-22 02:35:26 +00:00
Mike Jolley
7639cd8390
Calculations + ajax order item rows
2012-01-22 02:35:02 +00:00
Mike Jolley
31fc0c6cca
Cleaned up order page styling
2012-01-21 16:59:09 +00:00
Geert De Deckere
7706ecfe7b
Starting class names with a capital. Closes #519 .
2012-01-21 10:07:54 +01:00
Patrick Garman
92c3d2d611
one less function to write in gateway development
2012-01-21 03:10:59 +00:00
Mike Jolley
57e233adb1
Switched to .com maps. Closes #515 .
2012-01-21 01:18:49 +00:00
Mike Jolley
3ea6535910
Payment complete tweak Closes #513 .
2012-01-21 01:15:39 +00:00
Mike Jolley
0ef27c9fb7
fix for recent orders widget
2012-01-19 21:45:57 +00:00
Mike Jolley
48f2f296ad
Merge pull request #517 from patrickgarman/master
...
Deprecated PHP in a few lines.
2012-01-19 10:23:32 -08:00
Patrick Garman
10f407b845
deprecated php
2012-01-19 17:49:48 +00:00
Mike Jolley
0ab045e16b
Fixed admin ajax
2012-01-18 17:49:55 +00:00
Mike Jolley
7675fd7ab1
Removed need to mandatory exclude meta
2012-01-18 17:32:24 +00:00
Mike Jolley
ef0ce00090
security fix
2012-01-18 17:19:04 +00:00
Mike Jolley
197b629307
Chart/report fixes
2012-01-18 16:54:05 +00:00
Mike Jolley
472a2b899f
Merge pull request #512 from GeertDD/master
...
Removed unused globals from countries class
2012-01-18 04:48:04 -08:00
Mike Jolley
4929dd4c4b
Added order to filter. #464 .
2012-01-18 12:32:39 +00:00
Mike Jolley
c407d60d85
Notice text tweak
2012-01-18 12:29:13 +00:00
Mike Jolley
3802145b96
Notice
2012-01-18 12:26:31 +00:00
Mike Jolley
b3665c35b2
Added help tabs to main WC admin pages
2012-01-18 11:53:34 +00:00
Geert De Deckere
9a1986ae55
Removed unused globals in countries class
2012-01-18 11:30:00 +01:00
Mike Jolley
41f35f172d
Fixes odd premature end of headers issue
2012-01-17 17:31:42 +00:00
Mike Jolley
53e194aece
has_downloadable_item fix
2012-01-17 17:01:30 +00:00
Mike Jolley
a4e987cde3
Don't calc shipping during ajax requests, except cart/checkout requests. Closes #509 .
2012-01-17 15:59:05 +00:00
Mike Jolley
0db108ab69
Typecase array Closes #506 .
2012-01-17 15:26:54 +00:00
Mike Jolley
b5c8609275
Readme/version
2012-01-17 15:20:11 +00:00
Mike Jolley
2bbe8a1bca
Coupon class fixes closes #507 .
2012-01-17 15:20:04 +00:00
Mike Jolley
be13c773e9
status
2012-01-17 11:58:20 +00:00
Mike Jolley
e69eb4b84d
Merge pull request #505 from GeertDD/master
...
Optimizations to the countries class
2012-01-16 02:10:16 -08:00
Geert De Deckere
69721c8276
Removed unneeded variable in countries class
2012-01-16 07:40:13 +01:00
Geert De Deckere
f40745f34c
Optimized get_base_country() and get_base_state()
2012-01-16 07:37:50 +01:00
Mike Jolley
1b5390913a
Merge pull request #502 from GeertDD/master
...
Some tweaks to the countries class
2012-01-15 02:49:58 -08:00
Geert De Deckere
67fceb9660
Optimized white space related regexes
2012-01-15 07:31:47 +01:00
Geert De Deckere
8ad5cfe25b
Made address format code easier to maintain
2012-01-15 07:22:43 +01:00
Geert De Deckere
f0ed4ee8ea
Merge branch 'master' of git://github.com/woothemes/woocommerce
2012-01-14 22:08:46 +01:00
Mike Jolley
935734655b
Added some text.
2012-01-14 20:51:18 +00:00
Geert De Deckere
a47d8681cb
Merge branch 'master' of git://github.com/woothemes/woocommerce
2012-01-14 21:36:13 +01:00
Mike Jolley
af2eb853d4
Merge pull request #500 from patrickgarman/master
...
Adding local delivery and local pickup shipping methods to CORE
2012-01-14 12:32:58 -08:00
Patrick Garman
2b7f772f32
Adding local delivery/pickup methods to CORE
2012-01-14 19:36:26 +00:00
Patrick Garman
d123c3f639
Adding local delivery and local pickup to CORE
2012-01-14 19:35:04 +00:00
Geert De Deckere
8af5d11a68
Merge branch 'master' of git://github.com/woothemes/woocommerce
2012-01-14 19:52:02 +01:00
Mike Jolley
d2c103ab12
readme
2012-01-14 18:00:41 +00:00