Commit Graph

2123 Commits

Author SHA1 Message Date
Rodrigo Primo edd8f14e40 Merge branch 'master' of github.com:woocommerce/woocommerce 2019-01-09 17:38:32 -02:00
Rodrigo Primo 0b09bef386
Merge pull request #22078 from unfulvio/make-shipping-options-available-text-filterable
Make shipping may be available text filterable
2019-01-09 17:38:00 -02:00
Rodrigo Primo 7daf97d1f8 phpcs fixes
this indentation change is a bit odd but makes phpcs happy
2019-01-09 17:32:27 -02:00
Mike Jolley fe02144d0a
Merge pull request #21927 from woocommerce/add/21925
Make links in order notes clickable.
2019-01-09 16:52:37 +00:00
Mike Jolley a07cadf510
Merge pull request #21958 from mahdiyazdani/patch-2
Updated conditional statements to Yoda style
2019-01-09 12:11:53 +00:00
Bradley Davis 44bfd1127f Removed indent after <?php to be match other files (#22390) 2019-01-09 11:31:14 +00:00
Mike Jolley 127965419b
Merge pull request #22333 from Prospress/fix/21607
fix W3C validation errors in quantity-input.php template
2019-01-09 11:26:48 +00:00
Rodrigo Primo d71cb562aa Properly align order item meta in RTL emails
Since commit
4082222f7a (diff-30dd34631dd7461f75c05ded270e9ee4R60), order item meta is not aligned properly in order e-mails when using a RTL language. This commit fixes this problem by using the is_rtl() function to determine the float side for the element that contains the order item meta information.
2019-01-08 14:17:55 -02:00
Rodrigo Primo a48639b7bc Fix PHPCS violations automatilly with PHPCBF 2019-01-08 13:57:25 -02:00
Mike Jolley dcdc7657c3 This is for 3.6 2019-01-08 15:00:34 +00:00
Mike Jolley eef05fafe9 update from master 2019-01-08 15:00:23 +00:00
Mike Jolley 038a1a103a
Merge pull request #21496 from kukac7/feature/img-optim
images, svgs optim
2019-01-08 11:25:10 +00:00
Mike Jolley 04d7e54d42 Set country value when loading fields rather than in template files 2019-01-07 16:04:01 +00:00
Mike Jolley 2724fd76cd
Merge pull request #22017 from Bradley-D/feature/wpcs-inline-php
WPCS: inline PHP semicolon and spacing
2019-01-07 12:47:08 +00:00
Ron Rennick 38a7e77a44 fix W3C validation errors in quantity-input.php template 2019-01-03 14:05:43 -04:00
Claudiu Lodromanean ef05bfccfc
Merge pull request #22214 from Prospress/fix/22213
remove em tags from translated string
2019-01-02 12:04:28 -08:00
cynepkot 87c2e9066f
Update to email-styles.php to fix the iOS email app layout issue
Adding a style property to fix the iOS email app layout issue, described in #22308.
2018-12-28 17:37:03 +03:00
Ron Rennick 4cda9d3237 bump template version 2018-12-14 08:46:47 -04:00
Rodrigo Primo 1a8dcad2e8 Bump template version 2018-12-13 16:28:15 -02:00
Rodrigo Primo 8c9bd03692 Fix phpcs violations and improve indentation 2018-12-13 16:14:14 -02:00
Ron Rennick 3e96b57489 remove em tags from translated string 2018-12-13 13:07:03 -04:00
Ron Rennick 73de71d8d4 fix merge conflict 2018-12-12 09:23:38 -06:00
Ron Rennick 34bdc3744a phpcs sniff fixes for templates/single-product-reviews.php 2018-12-07 09:59:01 -06:00
Bradley Davis e97204a483 Removed @author tag from docbloc in the template files 2018-12-06 12:13:39 -02:00
grigorijurasov adbce426c5
Line 27 - replacing a typo in the comment
Line 27 - there's currently a typo, `numer`, changing that to `number`
2018-12-06 12:38:42 +02:00
claudiulodro 2fed9b94a3 Remove duplicate sanitizing 2018-11-30 08:49:43 -08:00
claudiulodro 2bccd4899a Revise to make code cleaner 2018-11-30 08:49:43 -08:00
claudiulodro d1533261f5 Extra sanitizing around payment_method_title 2018-11-30 08:49:43 -08:00
Fulvio Notarstefano 3c4f0db9cc Make shipping may estimate text filterable 2018-11-29 17:16:22 +08:00
Fulvio Notarstefano 1d2700e42f Make shipping may be available text filterable 2018-11-29 14:19:20 +08:00
Rodrigo Primo a096e2729a
Merge pull request #21936 from woocommerce/fix/21878
Use wp_kses_post for sanitizing product names instead of esc_html
2018-11-22 10:54:57 -02:00
Bradley Davis 7481af8614 [ UPDATE ] inline PHP semicolon and spacing 2018-11-22 20:37:14 +10:00
Claudiu Lodromanean b85598a576
Merge pull request #22001 from woocommerce/fix/21792
Fix missing lost password notices
2018-11-21 13:06:39 -08:00
Gerhard Potgieter 7c7f0725ef Update new account email copy to be representative of auto generated accounts also. (#21999)
* Update customer new account email copy to be more friendly for auto generated usernames.

* Bump template versions
2018-11-21 15:27:33 -02:00
Gerhard f58fcf6b3b Add woocommerce_before_lost_password_form and woocommerce_after_lost_password_form actions and hook into woocommerce_output_all_notices 2018-11-21 10:32:28 +02:00
Gerhard 097861605e Update translators comment to reflect true variable 2018-11-19 11:38:30 +02:00
Mahdi Yazdani ac298674c7
Updated conditional statements to Yoda style
Updated both user registration conditional statements to [Yoda](https://en.wikipedia.org/wiki/Yoda_conditions) style.
2018-11-18 01:16:51 +04:00
claudiulodro d09e9eb95c Use wp_kses_post for sanitizing product names instead of esc_html 2018-11-15 11:42:22 -08:00
Gerhard 2db7197d38 Revert parts of #20881. Passing html through wp_kses_post will strip out things like data attributes on allowed elements. 2018-11-15 15:04:37 +02:00
Gerhard 6b9f283d6d Make the note clickable in the email as well. 2018-11-15 14:30:58 +02:00
Claudiu Lodromanean d3c67b675b
Merge pull request #21879 from mcary/fix-this-in-invoice
Fix error when rendering customer invoice email
2018-11-14 15:08:13 -05:00
Ron Rennick 60e3918953 fix coding standards in templates/single-product-reviews.php 2018-11-14 15:20:19 -04:00
Ron Rennick 177145b6a5 Introduce `woocommerce_reviews_title` filter 2018-11-14 14:41:56 -04:00
Marcel M. Cary a0cb6a9166 Fix error when rendering customer invoice email
When sending a customer their invoice on a non-pending order, I get this
error in the logs:

    PHP Fatal error: Uncaught Error: Using $this when not in object context in
    wp-content/plugins/woocommerce/templates/emails/plain/customer-invoice.php:37

    Stack trace:
    #0 wp-content/plugins/woocommerce/includes/wc-core-functions.php(208): include()
    #1 wp-content/plugins/woocommerce/includes/wc-core-functions.php(228): wc_get_template('emails/plain/cu...', Array, '', '')
    #2 wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-invoice.php(165): wc_get_template_html('emails/plain/cu...', Array)
    #3 wp-content/plugins/woocommerce/includes/emails/class-wc-email.php(502): WC_Email_Customer_Invoice->get_content_plain()
    #4 wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-invoice.php(130): WC_Email->get_content()
    #5 wp-content/plugins/woocommerce/includes/class-wc-emails.php(338): WC_Email_Customer_Invoice->trigger(288402, Object(WC_Order))
    #6 wp-content/plugins/woocommerce/templates/emails/plain/customer-invoice.php on line 37
    referer: wp-admin/post.php?post=nnnnnn&action=edit

Change the "$this->object" reference to "$order" instead.
2018-11-10 14:07:55 -08:00
Ron Rennick b5d52909e2 update lost password filter name in password confirmation template 2018-11-06 10:47:06 -04:00
dixitadusara 2613770f09 remove Over to you text from admin order confirmation email 2018-10-27 13:02:05 +05:30
nishitlangaliya cbcd647a34 Merge branch 'master' of https://github.com/woocommerce/woocommerce into HEAD
# Conflicts:
#	.github/CONTRIBUTING.md
#	includes/gateways/cod/class-wc-gateway-cod.php
#	includes/wc-formatting-functions.php
#	templates/single-product/product-image.php
2018-10-27 12:14:09 -08:00
Kathy Darling 5c722a32e8 Add support for custom classes on quantity input with new woocommerce_quantity_input_classes filter 2018-10-13 22:22:17 -05:00
Frédéric Demarle 4e636b4b31 Fix payment url in plain customer invoice email 2018-10-04 21:00:52 +02:00
béla 850ff9ea25
email styles beautification 2018-10-04 11:21:56 +02:00
Claudiu Lodromanean 4cbdcf2d1b
Merge pull request #21439 from Prospress/escape-gateway-attributes
consistently escape gateway ID in payment method template
2018-10-03 13:43:13 -04:00
Ron Rennick 357d47a28c update template version 2018-10-03 12:05:12 -03:00
Ron Rennick 8c893b2112 use correct rule name in ignore 2018-10-02 14:38:12 -03:00
Ron Rennick e4c3966852 add second phpcs: ignore 2018-10-02 08:46:16 -03:00
Ron Rennick cdf036454f add spaces, remove @author, change control structure 2018-10-01 22:02:06 -03:00
Ron Rennick f3909c00e8 fix/add exceptions for existing coding standard violations 2018-10-01 09:08:18 -03:00
Claudio Sanches 819d03fe3f Updated "--" to "&mdash;"
Closes #21460
2018-09-28 12:52:38 -03:00
claudiulodro 4082222f7a Add inline float style for email label to match order details styling 2018-09-26 11:13:29 -07:00
Kevin 9e01b0dfe2
Update order of remember me and submit button
Have the same structure and logic as wp-login.php - Seems more logic to have the checkbox of Remember me before the Login button.
2018-09-26 18:58:59 +02:00
Ron Rennick e6de32eeb3 consistently escape gateway ID in payment method template 2018-09-25 16:04:09 -03:00
Gerhard Potgieter e92256309e Update template version number for template changes in efe06cb147 2018-09-25 12:09:01 +02:00
pierrebuet 4bed2ddeea Correct spaces 2018-09-24 21:45:55 +02:00
pierrebuet db3270a390 Show the right size of placeholder image on single product page
in the template for the product image, wc_placeholder_img_src() returns the thumbnail size of the image.
In order to use 'woocommerce_single' as size, the function needs to be corrected, so the function use the size and not a calculated array of sizes.  wc_get_image_size doesn't return an height for the woocommerce_single size. Further and since the image sizes are declared, there is no need to translate the size to an array.
2018-09-21 19:33:04 +02:00
unknown f4c418fa72 New function hooked 2018-09-20 09:23:42 +03:00
Claudiu Lodromanean 07351d5e11
Merge pull request #21288 from woocommerce/update/humanize-emails
Humanize emails
2018-09-12 07:51:07 -07:00
Gerhard Potgieter 5f7b833844 Add missing # before order numbers and escape properly 2018-09-12 12:24:27 +02:00
Gerhard Potgieter d7cb15c8f8 Update email copy based on https://github.com/woocommerce/woocommerce/pull/21288#issuecomment-420251277 2018-09-12 11:30:53 +02:00
Gerhard Potgieter 3b57bf7051 Fix invoice escaping 2018-09-07 09:54:31 +02:00
Gerhard Potgieter c3d9ef1cab Fix missing paramater passing for reset password emails and fix sanitisation 2018-09-07 08:59:23 +02:00
Gerhard Potgieter 6305fe3059 Use user_login on new account emails, no order object present there. 2018-09-07 08:45:10 +02:00
Gerhard Potgieter b52eef4454 Fix usage of get_first_name to correct get_billing_first_name 2018-09-07 08:40:45 +02:00
Claudiu Lodromanean 35feb7aa92
Merge pull request #21261 from franticpsyx/remove-mini-cart-template-space
Remove unnecessary space in mini-cart template
2018-09-06 12:00:10 -07:00
Manos Psychogyiopoulos d4f6d173d5 Bump template version 2018-09-06 21:05:31 +03:00
Gerhard Potgieter 866aab0ead New accout email copy changes 2018-09-06 14:38:43 +02:00
Gerhard Potgieter cf03db7392 Update customer reset password email copy 2018-09-06 14:18:09 +02:00
Gerhard Potgieter 68b5fbe279 Customer note email copy changes 2018-09-06 13:58:56 +02:00
Gerhard Potgieter 9361aaa05b Update invoice emails copy 2018-09-06 13:48:40 +02:00
Gerhard Potgieter fac659c9c6 Update refunded emails copy 2018-09-06 13:24:28 +02:00
Gerhard Potgieter 84b935490d Update completed email copy 2018-09-06 13:11:58 +02:00
Gerhard Potgieter 52190bc5ce Update closing line to correct text 2018-09-06 13:01:20 +02:00
Gerhard Potgieter 5eaa6da98b Update processing emails copy 2018-09-06 13:00:21 +02:00
Gerhard Potgieter 697e3229f2 Update on-hold emails copy 2018-09-06 12:48:39 +02:00
Gerhard Potgieter b03e5cff45 Failed admin email changes 2018-09-06 12:30:33 +02:00
Robert DeVore 348307eb5e
Update spacing 2018-09-04 14:20:14 -04:00
Robert DeVore e4ec0cb148
Spacing update 2018-09-04 14:19:28 -04:00
Manos Psychogyiopoulos 74ca1ebe6a Remove unnecessary space in mini-cart template 2018-09-03 13:50:48 +03:00
Robert DeVore 4a71ce4659 Add action hook to register form tag 2018-09-01 11:24:33 -04:00
Robert DeVore 03900a43cb Add action hook to edit account form tag 2018-09-01 11:24:04 -04:00
Raymond Johnson 5ee8a794f0
Add consistent classes to order tracking form. 2018-08-30 17:53:32 -05:00
Farhad Sakhaei a22218f5f9
Update single-product-reviews.php 2018-08-29 00:25:03 +04:30
Farhad Sakhaei 7c3a3503ff
unnecessary aria-required for elements that have required
Attribute aria-required is unnecessary for elements that have attribute required.
2018-08-28 13:05:40 +04:30
Peter Fabian 0d29e5d88f PHPCS fix. 2018-08-23 14:31:53 +02:00
Gerhard Potgieter 2ce1262f69 Humanize admin cancelled order emails 2018-08-23 09:38:16 +02:00
Gerhard Potgieter 679399b4b2 Humanize admin new order email 2018-08-23 09:04:24 +02:00
Peter Fabian ae05d6e5ea Removed author tag and bumped version of templates to 3.5.0, factored out function to one common place. 2018-08-21 11:47:50 +02:00
Peter Fabian ac550e9d37 PHPCS. 2018-08-20 18:38:53 +02:00
Peter Fabian c2b8cc73c0 Added support for changing tabindex for notices. 2018-08-20 18:35:17 +02:00
Gerhard Potgieter 87cfc646f4
Fix PHPCS errors (#21009) 2018-08-08 11:19:36 +02:00
Gerhard Potgieter 7db8940d2d
Merge pull request #20982 from shabnam611/fix/20943
Fix for issue 20943: Removed unnecessary php tag [point 2] and removed a return false stat…
2018-08-08 10:51:31 +02:00
Shabnam 722c21066f changed version to 3.5.0 and adjusted the curly brace 2018-08-08 13:27:54 +06:00