Skip to content
Permalink
Browse files

Merge branch 'master' into feature/rest-api-v3

  • Loading branch information...
claudiosanches committed Sep 10, 2018
2 parents ba0a989 + 48bf960 commit 61873627a70919dc0a6d256bccb3bd0ce04c92ac
Showing with 15,127 additions and 1,755 deletions.
  1. +2 −2 .codecov.yml
  2. +3 −2 .travis.yml
  3. +41 −0 CHANGELOG.txt
  4. +1 −1 Gruntfile.js
  5. +1 −1 assets/css/activation-rtl.css
  6. +1 −1 assets/css/activation.css
  7. +2 −2 assets/css/admin-rtl.css
  8. +2 −2 assets/css/admin.css
  9. +17 −0 assets/css/admin.scss
  10. +1 −1 assets/css/auth-rtl.css
  11. +1 −1 assets/css/auth.css
  12. +1 −1 assets/css/dashboard-rtl.css
  13. +1 −1 assets/css/dashboard.css
  14. +8 −0 assets/css/dashboard.scss
  15. +1 −1 assets/css/helper-rtl.css
  16. +1 −1 assets/css/helper.css
  17. +1 −1 assets/css/menu-rtl.css
  18. +1 −1 assets/css/menu.css
  19. +1 −1 assets/css/network-order-widget-rtl.css
  20. +1 −1 assets/css/network-order-widget.css
  21. +1 −1 assets/css/prettyPhoto-rtl.css
  22. +1 −1 assets/css/prettyPhoto.css
  23. +1 −1 assets/css/reports-print-rtl.css
  24. +1 −1 assets/css/reports-print.css
  25. +1 −1 assets/css/select2.css
  26. +1 −1 assets/css/twenty-seventeen-rtl.css
  27. +1 −1 assets/css/twenty-seventeen.css
  28. +0 −1 assets/css/twenty-seventeen.scss
  29. +1 −1 assets/css/wc-setup-rtl.css
  30. +1 −1 assets/css/wc-setup.css
  31. +50 −7 assets/css/wc-setup.scss
  32. +1 −1 assets/css/woocommerce-layout-rtl.css
  33. +1 −1 assets/css/woocommerce-layout.css
  34. +1 −1 assets/css/woocommerce-rtl.css
  35. +1 −1 assets/css/woocommerce-smallscreen-rtl.css
  36. +1 −1 assets/css/woocommerce-smallscreen.css
  37. +1 −1 assets/css/woocommerce.css
  38. BIN assets/images/obw-shipstation-icon.png
  39. BIN assets/images/obw-woocommerce-services-icon.png
  40. +7 −0 assets/js/admin/meta-boxes-order.js
  41. +2 −0 assets/js/admin/wc-product-export.js
  42. +27 −0 assets/js/admin/wc-setup.js
  43. +33 −29 assets/js/frontend/add-to-cart-variation.js
  44. +1 −1 assets/js/frontend/add-to-cart-variation.min.js
  45. +1 −1 assets/js/frontend/add-to-cart.js
  46. +3 −12 assets/js/frontend/woocommerce.js
  47. +21 −1 i18n/locale-info.php
  48. +1 −1 i18n/states/IR.php
  49. +32 −0 i18n/states/PY.php
  50. +1 −3 includes/abstracts/abstract-wc-data.php
  51. +25 −2 includes/abstracts/abstract-wc-product.php
  52. +4 −0 includes/admin/class-wc-admin-exporters.php
  53. +3 −2 includes/admin/class-wc-admin-menus.php
  54. +252 −159 includes/admin/class-wc-admin-setup-wizard.php
  55. +16 −0 includes/admin/class-wc-admin-status.php
  56. +2 −2 includes/admin/class-wc-admin-taxonomies.php
  57. +2 −0 includes/admin/importers/class-wc-product-csv-importer-controller.php
  58. +1 −0 includes/admin/importers/mappings/default.php
  59. +25 −1 includes/admin/list-tables/class-wc-admin-list-table-products.php
  60. +9 −8 includes/admin/meta-boxes/class-wc-meta-box-product-data.php
  61. +17 −9 includes/admin/meta-boxes/views/html-order-refund.php
  62. +21 −1 includes/admin/meta-boxes/views/html-product-data-inventory.php
  63. +1 −1 includes/admin/meta-boxes/views/html-product-data-shipping.php
  64. +2 −2 includes/admin/meta-boxes/views/html-variation-admin.php
  65. +1 −1 includes/admin/reports/class-wc-report-customer-list.php
  66. +1 −1 includes/admin/settings/views/settings-tax.php
  67. +13 −0 includes/admin/views/html-admin-page-product-export.php
  68. +1 −1 includes/admin/wc-admin-functions.php
  69. +1 −1 includes/api/class-wc-rest-customers-controller.php
  70. +6 −1 includes/api/class-wc-rest-products-controller.php
  71. +1 −1 includes/api/v1/class-wc-rest-customers-controller.php
  72. +36 −12 includes/api/v2/class-wc-rest-system-status-v2-controller.php
  73. +3 −2 includes/class-wc-ajax.php
  74. +1 −1 includes/class-wc-background-updater.php
  75. +1 −1 includes/class-wc-cache-helper.php
  76. +5 −0 includes/class-wc-cart-session.php
  77. +17 −2 includes/class-wc-cart.php
  78. +18 −8 includes/class-wc-checkout.php
  79. +24 −5 includes/class-wc-countries.php
  80. +1 −1 includes/class-wc-customer.php
  81. +4 −4 includes/class-wc-discounts.php
  82. +0 −2 includes/class-wc-form-handler.php
  83. +2 −2 includes/class-wc-frontend-scripts.php
  84. +0 −1 includes/class-wc-geolocation.php
  85. +18 −2 includes/class-wc-install.php
  86. +1 −1 includes/class-wc-order-item.php
  87. +1 −0 includes/class-wc-product-query.php
  88. +4 −3 includes/class-wc-product-variable.php
  89. +1 −4 includes/class-wc-regenerate-images.php
  90. +3 −5 includes/class-wc-session-handler.php
  91. +0 −2 includes/class-wc-shipping.php
  92. +1 −1 includes/class-wc-structured-data.php
  93. +1 −1 includes/class-wc-tax.php
  94. +16 −1 includes/class-wc-template-loader.php
  95. +1 −1 includes/class-wc-validation.php
  96. +23 −3 includes/class-woocommerce.php
  97. +2 −2 includes/data-stores/class-wc-customer-download-data-store.php
  98. +4 −4 includes/data-stores/class-wc-customer-download-log-data-store.php
  99. +30 −11 includes/data-stores/class-wc-data-store-wp.php
  100. +23 −5 includes/data-stores/class-wc-product-data-store-cpt.php
  101. +1 −0 includes/data-stores/class-wc-product-variation-data-store-cpt.php
  102. +2 −2 includes/export/abstract-wc-csv-exporter.php
  103. +98 −29 includes/export/class-wc-product-csv-exporter.php
  104. +7 −2 includes/gateways/paypal/class-wc-gateway-paypal.php
  105. +1 −1 includes/gateways/paypal/includes/class-wc-gateway-paypal-pdt-handler.php
  106. +1 −1 includes/import/abstract-wc-product-importer.php
  107. +4 −2 includes/import/class-wc-product-csv-importer.php
  108. +121 −0 includes/interfaces/class-wc-queue-interface.php
  109. +3 −0 includes/libraries/action-scheduler/.gitignore
  110. +37 −0 includes/libraries/action-scheduler/.travis.yml
  111. +433 −0 includes/libraries/action-scheduler/README.md
  112. +47 −0 includes/libraries/action-scheduler/action-scheduler.php
  113. +122 −0 includes/libraries/action-scheduler/classes/ActionScheduler.php
  114. +656 −0 includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_ListTable.php
  115. +89 −0 includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_QueueRunner.php
  116. +75 −0 includes/libraries/action-scheduler/classes/ActionScheduler_Action.php
  117. +23 −0 includes/libraries/action-scheduler/classes/ActionScheduler_ActionClaim.php
  118. +111 −0 includes/libraries/action-scheduler/classes/ActionScheduler_ActionFactory.php
  119. +78 −0 includes/libraries/action-scheduler/classes/ActionScheduler_AdminView.php
  120. +147 −0 includes/libraries/action-scheduler/classes/ActionScheduler_AdminView_Deprecated.php
  121. +21 −0 includes/libraries/action-scheduler/classes/ActionScheduler_CanceledAction.php
  122. +50 −0 includes/libraries/action-scheduler/classes/ActionScheduler_CronSchedule.php
  123. +20 −0 includes/libraries/action-scheduler/classes/ActionScheduler_DateTime.php
  124. +54 −0 includes/libraries/action-scheduler/classes/ActionScheduler_FatalErrorMonitor.php
  125. +16 −0 includes/libraries/action-scheduler/classes/ActionScheduler_FinishedAction.php
  126. +62 −0 includes/libraries/action-scheduler/classes/ActionScheduler_IntervalSchedule.php
  127. +526 −0 includes/libraries/action-scheduler/classes/ActionScheduler_ListTable.php
  128. +67 −0 includes/libraries/action-scheduler/classes/ActionScheduler_LogEntry.php
  129. +47 −0 includes/libraries/action-scheduler/classes/ActionScheduler_Logger.php
  130. +16 −0 includes/libraries/action-scheduler/classes/ActionScheduler_NullAction.php
  131. +11 −0 includes/libraries/action-scheduler/classes/ActionScheduler_NullLogEntry.php
  132. +19 −0 includes/libraries/action-scheduler/classes/ActionScheduler_NullSchedule.php
  133. +144 −0 includes/libraries/action-scheduler/classes/ActionScheduler_QueueCleaner.php
  134. +169 −0 includes/libraries/action-scheduler/classes/ActionScheduler_QueueRunner.php
  135. +18 −0 includes/libraries/action-scheduler/classes/ActionScheduler_Schedule.php
  136. +44 −0 includes/libraries/action-scheduler/classes/ActionScheduler_SimpleSchedule.php
  137. +210 −0 includes/libraries/action-scheduler/classes/ActionScheduler_Store.php
  138. +44 −0 includes/libraries/action-scheduler/classes/ActionScheduler_TimezoneHelper.php
  139. +62 −0 includes/libraries/action-scheduler/classes/ActionScheduler_Versions.php
  140. +204 −0 includes/libraries/action-scheduler/classes/ActionScheduler_WPCLI_QueueRunner.php
  141. +145 −0 includes/libraries/action-scheduler/classes/ActionScheduler_WPCLI_Scheduler_command.php
  142. +278 −0 includes/libraries/action-scheduler/classes/ActionScheduler_wpCommentLogger.php
  143. +732 −0 includes/libraries/action-scheduler/classes/ActionScheduler_wpPostStore.php
  144. +57 −0 includes/libraries/action-scheduler/classes/ActionScheduler_wpPostStore_PostStatusRegistrar.php
  145. +50 −0 includes/libraries/action-scheduler/classes/ActionScheduler_wpPostStore_PostTypeRegistrar.php
  146. +26 −0 includes/libraries/action-scheduler/classes/ActionScheduler_wpPostStore_TaxonomyRegistrar.php
  147. +13 −0 includes/libraries/action-scheduler/codecov.yml
  148. +12 −0 includes/libraries/action-scheduler/composer.json
  149. +2,909 −0 includes/libraries/action-scheduler/composer.lock
  150. +186 −0 includes/libraries/action-scheduler/functions.php
  151. +318 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression.php
  152. +100 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_AbstractField.php
  153. +110 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_DayOfMonthField.php
  154. +124 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_DayOfWeekField.php
  155. +55 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_FieldFactory.php
  156. +39 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_FieldInterface.php
  157. +47 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_HoursField.php
  158. +39 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_MinutesField.php
  159. +55 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_MonthField.php
  160. +43 −0 includes/libraries/action-scheduler/lib/cron-expression/CronExpression_YearField.php
  161. +19 −0 includes/libraries/action-scheduler/lib/cron-expression/LICENSE
  162. +92 −0 includes/libraries/action-scheduler/lib/cron-expression/README.md
  163. +674 −0 includes/libraries/action-scheduler/license.txt
  164. +44 −0 includes/libraries/action-scheduler/tests/ActionScheduler_UnitTestCase.php
  165. +31 −0 includes/libraries/action-scheduler/tests/bootstrap.php
  166. +32 −0 includes/libraries/action-scheduler/tests/phpunit.xml.dist
  167. +44 −0 includes/libraries/action-scheduler/tests/phpunit/deprecated/ActionScheduler_UnitTestCase.php
  168. +55 −0 includes/libraries/action-scheduler/tests/phpunit/jobs/ActionScheduler_Action_Test.php
  169. +16 −0 includes/libraries/action-scheduler/tests/phpunit/jobs/ActionScheduler_NullAction_Test.php
  170. +352 −0 includes/libraries/action-scheduler/tests/phpunit/jobstore/ActionScheduler_wpPostStore_Test.php
  171. +166 −0 includes/libraries/action-scheduler/tests/phpunit/logging/ActionScheduler_wpCommentLogger_Test.php
  172. +142 −0 includes/libraries/action-scheduler/tests/phpunit/procedural_api/procedural_api_Test.php
  173. +100 −0 includes/libraries/action-scheduler/tests/phpunit/procedural_api/wc_get_scheduled_actions_Test.php
  174. +151 −0 includes/libraries/action-scheduler/tests/phpunit/runner/ActionScheduler_QueueCleaner_Test.php
  175. +209 −0 includes/libraries/action-scheduler/tests/phpunit/runner/ActionScheduler_QueueRunner_Test.php
  176. +45 −0 includes/libraries/action-scheduler/tests/phpunit/schedules/ActionScheduler_CronSchedule_Test.php
  177. +28 −0 ...udes/libraries/action-scheduler/tests/phpunit/schedules/ActionScheduler_IntervalSchedule_Test.php
  178. +18 −0 includes/libraries/action-scheduler/tests/phpunit/schedules/ActionScheduler_NullSchedule_Test.php
  179. +37 −0 includes/libraries/action-scheduler/tests/phpunit/schedules/ActionScheduler_SimpleSchedule_Test.php
  180. +43 −0 includes/libraries/action-scheduler/tests/phpunit/versioning/ActionScheduler_Versions_Test.php
  181. +38 −0 includes/libraries/action-scheduler/tests/travis/setup.sh
  182. +38 −0 includes/libraries/action-scheduler/tests/travis/wp-tests-config.php
  183. +146 −0 includes/queue/class-wc-action-queue.php
  184. +82 −0 includes/queue/class-wc-queue.php
  185. +6 −0 includes/shortcodes/class-wc-shortcode-checkout.php
  186. +1 −1 includes/shortcodes/class-wc-shortcode-my-account.php
  187. +7 −2 includes/shortcodes/class-wc-shortcode-products.php
  188. +16 −16 includes/wc-attribute-functions.php
  189. +3 −3 includes/wc-cart-functions.php
  190. +3 −0 includes/wc-formatting-functions.php
  191. +21 −1 includes/wc-notice-functions.php
  192. +6 −2 includes/wc-product-functions.php
  193. +21 −4 includes/wc-stock-functions.php
  194. +1 −4 includes/wc-template-functions.php
  195. +2 −4 includes/wc-term-functions.php
  196. +22 −4 includes/wc-update-functions.php
  197. +1 −1 includes/wc-webhook-functions.php
  198. +1 −1 includes/widgets/class-wc-widget-layered-nav.php
  199. +1 −1 phpcs.xml
  200. +3 −4 templates/cart/mini-cart.php
  201. +2 −2 templates/checkout/form-coupon.php
  202. +10 −6 templates/content-widget-product.php
  203. +2 −2 templates/myaccount/form-edit-account.php
  204. +2 −2 templates/myaccount/form-login.php
  205. +8 −5 templates/notices/error.php
  206. +9 −6 templates/notices/notice.php
  207. +8 −5 templates/notices/success.php
  208. +6 −5 templates/order/order-details-customer.php
  209. +5 −5 templates/single-product-reviews.php
  210. +5 −8 templates/single-product/share.php
  211. +1 −0 tests/bin/install.sh
  212. +1 −1 tests/bin/phpunit.sh
  213. +0 −6 tests/bin/travis.sh
  214. +1 −0 tests/bootstrap.php
  215. +11 −1 tests/framework/class-wc-unit-test-case.php
  216. +15 −5 tests/framework/helpers/class-wc-helper-product.php
  217. +440 −0 tests/includes/wp-http-testcase.php
  218. +288 −2 tests/unit-tests/api/product-variations.php
  219. +289 −23 tests/unit-tests/api/products.php
  220. +33 −33 tests/unit-tests/api/system-status.php
  221. +361 −416 tests/unit-tests/cart/cart.php
  222. +6 −27 tests/unit-tests/cart/functions.php
  223. +7 −119 tests/unit-tests/coupon/coupon.php
  224. +55 −0 tests/unit-tests/customer/class-wc-customer-download-log-data-store.php
  225. +0 −6 tests/unit-tests/customer/customer.php
  226. +72 −37 tests/unit-tests/discounts/discounts.php
  227. +1 −0 tests/unit-tests/exporter/product.php
  228. +37 −6 tests/unit-tests/formatting/functions.php
  229. +0 −7 tests/unit-tests/gateways/gateways.php
  230. +23 −36 tests/unit-tests/gateways/paypal/request.php
  231. +28 −0 tests/unit-tests/importer/product.php
  232. +23 −25 tests/unit-tests/order-items/order-item-fee.php
  233. +14 −55 tests/unit-tests/order/coupons.php
  234. +0 −8 tests/unit-tests/product/data-store.php
  235. +12 −18 tests/unit-tests/product/data.php
  236. +43 −2 tests/unit-tests/product/functions.php
  237. +0 −39 tests/unit-tests/product/product-simple.php
  238. +57 −28 tests/unit-tests/product/query.php
  239. +33 −113 tests/unit-tests/shipping-zones/shipping-zone.php
  240. +44 −66 tests/unit-tests/shipping-zones/shipping-zones.php
  241. +149 −146 tests/unit-tests/tax/tax.php
  242. +3 −3 tests/unit-tests/templates/functions.php
  243. +66 −20 tests/unit-tests/totals/totals.php
  244. +114 −0 tests/unit-tests/util/class-wc-tests-core-functions.php
  245. +0 −3 tests/unit-tests/util/class-wc-tests-wc-query.php
  246. +1 −1 tests/unit-tests/util/validation.php
@@ -21,6 +21,6 @@ parsers:
macro: no

comment:
layout: "reach, diff, flags, files, footer"
layout: "files"
behavior: default
require_changes: no
require_changes: yes
@@ -28,20 +28,21 @@ matrix:
dist: precise
- php: 7.2
env: WP_VERSION=latest WP_MULTISITE=0 RUN_PHPCS=1 RUN_E2E=1
- php: 7.2
- php: 7.1
env: WP_VERSION=latest WP_MULTISITE=0 RUN_CODE_COVERAGE=1
allow_failures:
- env: WP_VERSION=latest WP_MULTISITE=0 RUN_CODE_COVERAGE=1

before_script:
- phpenv config-rm xdebug.ini
- export PATH="$HOME/.composer/vendor/bin:$PATH"
- bash tests/bin/install.sh woocommerce_test root '' localhost $WP_VERSION
- bash tests/bin/travis.sh before

script:
- bash tests/bin/phpunit.sh
- bash tests/bin/phpcs.sh
- bash tests/bin/run-e2e-CI.sh
- travis_retry bash tests/bin/run-e2e-CI.sh

after_script:
- bash tests/bin/travis.sh after
@@ -1,5 +1,46 @@
== Changelog ==

= 3.4.5 - 2018-08-29 =
* Fix - Tweak sanitization when resetting password cookie. #20901
* Fix - Use `+` instead of `array_merge` when appending parent to tax class to fix issues with numeric tax class names. #20916
* Fix - Correct translation for North Khorasan. #20972
* Fix - Unify scroll-to notices for all browsers. #20992
* Fix - Prevent multiple slashing of variation's SKU. #21019
* Fix - Variation image in fullscreen now shows correct caption for the respective image. #21022
* Fix - Vertically center admin order action buttons. #21053
* Fix - Correct context for shipping packages translation. #21065
* Fix - Add permission checks for installing Jetpack on the setup wizard. #21072
* Fix - Use refund currency instead of store default currency when displaying refund amount in the edit order screen. #21106
* Fix - Fix a typo in REST API customer schema. #21171
* Fix - Use entire sentence for checkout address_2 placeholder string. #21186
* Fix - Only suppress comments number on unsupported theme shop page. #21191
* Fix - Don't allow users without manage_product_terms permissions to create categories using the product importer. #21192
* Fix - Correct sale coupon restriction logic. #21219

= 3.4.4 - 2018-07-25 =
* Fix - Only wordwrap plain email content. #20723
* Fix - Better escaping on product quick edit. #20740
* Fix - Log file deletion. #20730
* Fix - Search feature in Webhooks and REST API keys settings. #20706
* Fix - Notices in REST API keys settings screen. #20706
* Fix - add a check to prevent WC_Geolite_Integration::get_country_iso() from generating a PHP undefined index notice when unable to determine the country code for a given IP address. #20608
* Fix - Variable product stock display if parent is stock managed and not the variation. #20661
* Fix - Correctly hide cost for zero cost shipping methods after placing orders. #20663
* Fix - Disabled autocomplete to prevent datepicker overlapping. #20687
* Fix - Prevent a PHP notice in the setup wizard when store state is not selectable. #20695
* Fix - Fix logic error in WC_Product_CSV_Exporter::get_column_value_stock. #20753
* Fix - Fixed missing notice about no product variation matching. #20762
* Fix - Correct PHPDocs in exporter class. #20861
* Fix - Prevent Mailchimp redirection during the Setup Wizard. #20879
* Fix - Don't hide coupon form after coupon has been applied. #20889
* Tweak - Remove (optional) text from Address line 2 field. #20622 #20639
* Tweak - Removed 100% width for images on single product page using 2017 theme. #20818
* Tweak - Add margin to best selling product title in the dashboard widget to avoid overlapping the sparkline. #20849
* Tweak - Re-add woocommerce_order_details_after_customer_details_filter removed during WC 3.2. #20886
* Dev - Added woocommerce_calculate_item_totals_taxes filter. #20586
* Dev - Links to next and previous page sent out in HTTP header via REST API fixed for some endpoints. #20686
* Dev - Better wc_format_phone_number cleaning. #20637

= 3.4.3 - 2018-06-20 =
* Fix - Fix label for the price filter widget on RTL sites. #20417
* Fix - Checkout: stopPropagation when payment method selected so description tips show on radio buttons. #20432
@@ -164,7 +164,7 @@ module.exports = function( grunt ) {
watch: {
css: {
files: ['<%= dirs.css %>/*.scss'],
tasks: ['sass', 'rtlcss', 'cssmin', 'concat']
tasks: ['sass', 'rtlcss', 'postcss', 'cssmin', 'concat']
},
js: {
files: [

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

0 comments on commit 6187362

Please sign in to comment.
You can’t perform that action at this time.