Commit Graph

718 Commits

Author SHA1 Message Date
Mike Jolley a7b81eed8a Merge pull request #4213 from kloon/fix_optimize_downloadable_products_dropdown
Make downloadable product dropdown ajaxy, as per #4211
2013-11-27 06:32:32 -08:00
Mike Jolley ec480e8233 Merge pull request #4224 from mihaigrigori/master
Explicit currency for order prices
2013-11-27 06:28:34 -08:00
Mike Jolley c05e369b43 Merge pull request #4215 from scottbasgaard/master
"Order again" doesn't work. Proposed pass at fix.
2013-11-27 06:27:39 -08:00
Gerhard 06020f4bd5 Move all download permissions inline js to meta-boxes.js 2013-11-27 16:03:04 +02:00
Gerhard a1ad556fb9 Clear selection after adding download permissions 2013-11-27 15:29:42 +02:00
mihaigrigori b19fb1ee09 Explicit currency for order prices
Set the currency for the order prices to be the order's currency instead
of the shop's currency. When these are different, the order emails are
misleading.

Related to https://github.com/woothemes/woocommerce/pull/4143
2013-11-27 11:15:20 +02:00
Coen Jacobs 19688ad9ef Fixed several @return void clauses. There are more. No code changes in this commit, only PhpDocs
Closes #4216
2013-11-27 10:03:47 +01:00
Scott Basgaard 538e704bba Merge branch 'master' of github.com:woothemes/woocommerce 2013-11-27 03:44:52 +01:00
Patrick Rauland 9ac8b406c5 removing postcode for Bolivia 2013-11-26 15:41:54 -06:00
Scott Basgaard 2885da4581 "Order again" doesn't work. Proposed pass at fix. 2013-11-26 17:48:39 +01:00
Mike Jolley 2cf95fc1eb Merge pull request #4207 from emzo/product-short-description-metabox
[2.1-beta-1] Remove second row of formatting buttons in product short description visual editor.
2013-11-26 08:25:21 -08:00
Gerhard 6300e65582 Make downloadable product dropdown ajaxy, as per #4211 2013-11-26 15:54:34 +02:00
Ryan McCue ff6f2e070e Use correct variable for OAuth parameter check 2013-11-26 11:19:00 +10:00
Emyr Thomas 4af19400b6 Remove the second row of formatting buttons in the TinyMCE editor for the
product short description meta box.
2013-11-25 21:53:40 +00:00
Mike Jolley 5e9a84f26c Fix ajax class functions and includes 2013-11-25 15:47:52 +00:00
Coen Jacobs ac34f94321 Merge pull request #4199 from tivnet/master
PhpDocs fixes
2013-11-25 07:45:08 -08:00
Coen Jacobs 173f341631 Moved cart related output functions to right file 2013-11-25 16:17:18 +01:00
Gregory K 5caf292456 PhpDoc fix in class-wc-cart 2013-11-25 10:06:06 -05:00
Gregory K ec5f2c3501 PhpDoc fixes in class-wc-coupon 2013-11-25 10:00:54 -05:00
Coen Jacobs 848dfd8bd0 Deprecate woocommerce_paying_customer the other way around 2013-11-25 15:51:14 +01:00
Coen Jacobs c800d83182 Merge pull request #4197 from tivnet/master
Corrected some PhpDocs in class-wc-cart
2013-11-25 06:43:38 -08:00
Coen Jacobs 4afbd0b556 Merge branch 'function-call-refactor'
Conflicts:
	includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php
	includes/shortcodes/class-wc-shortcode-cart.php
	includes/wc-template-functions.php
2013-11-25 15:42:26 +01:00
Mike Jolley d96661f45b Reverted template function names for @jameskoster's sanity 2013-11-25 14:35:10 +00:00
Mike Jolley b774e84e29 Revert "Replaced templates functions"
This reverts commit 4ce301a080.
2013-11-25 14:16:26 +00:00
Coen Jacobs 47ae00be28 Page functions woocommerce to wc refactor 2013-11-25 15:07:22 +01:00
Mike Jolley 51ba9c393f WC globals 2013-11-25 14:01:38 +00:00
Mike Jolley 3408965b8a Product functions 2013-11-25 14:01:38 +00:00
Mike Jolley 4ce301a080 Replaced templates functions 2013-11-25 14:01:37 +00:00
Mike Jolley 3973beae5d woocommerce_ functions to wc_ - replaced attribute functions 2013-11-25 14:01:37 +00:00
Coen Jacobs f7df17db1c Order functions woocommerce to wc refactor 2013-11-25 14:54:52 +01:00
Coen Jacobs c1a439eb99 Formatting functions woocommerce to wc refactor 2013-11-25 14:34:21 +01:00
Coen Jacobs 1663eafb68 Customer functions woocommerce to wc refactor 2013-11-25 13:52:53 +01:00
Coen Jacobs aaa14894ca Core functions woocommerce to wc refactor 2013-11-25 13:45:04 +01:00
Coen Jacobs b0e3802b5b Refactor cart functions in core 2013-11-25 13:44:32 +01:00
Gregory K f2e34496d0 Corrected some PhpDocs in class-wc-cart 2013-11-25 07:40:16 -05:00
Coen Jacobs cb4e239655 Cart functions woocommerce to wc refactor 2013-11-25 13:23:39 +01:00
Coen Jacobs aa4d9d5914 Better order for admin settings tabs 2013-11-25 12:06:42 +01:00
James Koster cf64302063 woocommerce status dashboard widget #4042 2013-11-25 10:40:05 +00:00
Coen Jacobs 6377a2af6e esc_attr instead of esc_url for textarea placeholder
Closes #4195
2013-11-25 10:41:37 +01:00
Coen Jacobs effc108af4 Merge pull request #4192 from maxrice/http-x-forwarded-host
Allow forwarded hosts for forced SSL
2013-11-25 00:44:41 -08:00
Coen Jacobs 2f3ed733fb Merge pull request #4182 from thenbrent/is-purchasable-check
Check products are purchasable when restoring cart
2013-11-25 00:39:16 -08:00
Coen Jacobs 084ac253f9 Merge pull request #4181 from kloon/fix_order_item_meta_ajax
Fix ajax calls for adding and deleting order item meta from the backend.
2013-11-25 00:38:50 -08:00
Coen Jacobs 65a1ed1b98 Fixed typo as merged in #4190 2013-11-25 09:38:03 +01:00
Coen Jacobs 8978f75f36 Remove safety net for calling WC_Product directly #4194 2013-11-25 09:25:45 +01:00
Coen Jacobs 7b63c6ce49 Remove parameters from function as well #4194 2013-11-25 09:19:24 +01:00
Coen Jacobs 73215ba4e2 Remove 2.0 tax deprecated arguments #4194 2013-11-25 09:17:44 +01:00
Coen Jacobs 6acfff9879 Fixed field matching in setting up variations 2013-11-25 09:05:27 +01:00
Andrew Benbow 0f29761268 Bracing 2013-11-25 09:02:51 +01:00
Max Rice 72316d0b5f Allow forwarded hosts for forced SSL 2013-11-24 22:39:23 -05:00
Coen Jacobs 8054316fa6 Merge pull request #4185 from maxrice/rest-api-fixes-issue-4055
Various fixes for REST API
2013-11-24 12:58:25 -08:00