46c15b235a
Merge pull request #17245 from woocommerce/fix/17216
...
Modal should only display for major updates
2017-10-16 22:33:00 -07:00
1f7a038bcd
Merge pull request #17242 from woocommerce/fix/17232
...
Fix meta data clone for products
2017-10-16 22:32:20 -07:00
ececd63c93
Merge pull request #17247 from woocommerce/fix/17221
...
Filter out invalid tax classes
2017-10-16 22:31:49 -07:00
0e7cb9940c
Filter out invalid tax classes
...
Closes #17221
2017-10-16 22:05:48 -07:00
47a609edb7
Modal should only display for major updates
...
Fixes #17216
2017-10-16 21:50:44 -07:00
3d55a45bfa
Only change nocacheheaders when on a cart/checkout page
2017-10-16 21:29:23 -07:00
fecf950a98
Merge pull request #17237 from woocommerce/fix/17235
...
Coupon user limit check fix
2017-10-16 21:15:15 -07:00
344456c115
Merge pull request #17234 from woocommerce/fix/17216
...
Scroll untested plugins list if it's too big
2017-10-16 21:08:07 -07:00
39443d23e5
Fix meta data clone for products
2017-10-16 21:05:29 -07:00
4c16aeac6d
Coupon user limit check fix
...
Fixes a where clause problem. Fixes #17235 .
2017-10-16 18:40:46 +01:00
4ebac67545
Scroll plugins list if it's too big
2017-10-16 09:10:20 -07:00
7419168e65
More cleanup and new fallback option for addresses
2017-10-16 08:12:07 -07:00
10fe92cfc1
Fix-minor-changes
2017-10-16 16:33:12 +05:30
a087f5fa63
Merge pull request #17205 from woocommerce/fix/invoice-subject
...
Remove # before order number to match 3.1
2017-10-13 19:38:55 +01:00
7b67d2d9a9
Remove # before order number to match 3.1
2017-10-13 19:37:03 +01:00
fc8b3266c9
Fix deprecated functions in cart shortcode
2017-10-13 14:22:09 -04:00
a2e580f59e
Merge pull request #17201 from woocommerce/fix/17200
...
Restore blogname placeholder, but do not list in admin
2017-10-13 19:15:50 +01:00
1865528486
Merge pull request #17197 from woocommerce/fix/17125
...
Use edit context when updating prices in the API
2017-10-13 18:54:58 +01:00
78c15569a7
Show theme overrides that are done through the wc_get_template filter in WooCommerce > Status
...
Fixes #17043
Call the wc_get_template filter on each template and show the file if it exists.
2017-10-14 00:07:38 +07:00
6647b35585
Restore blogname placeholder, but do not list in admin
...
Closes #17200
2017-10-13 17:42:12 +01:00
93a6f68408
Merge pull request #17193 from woocommerce/fix/legacy-fees-api
...
Fix/legacy fees api
2017-10-13 17:36:43 +01:00
fbc6850fb9
Merge pull request #17198 from JeroenSormani/fee-tax-class-slugs
...
Allow tax_class slugs when adding a fee
2017-10-13 17:25:46 +01:00
f244b178d3
Allow tax_class slugs when adding a fee
2017-10-13 18:06:23 +02:00
840da4f0c8
Use edit context when updating prices in the API
...
Fixes #17125
2017-10-13 16:37:38 +01:00
e4c961c3ba
Merge pull request #17194 from woocommerce/update/email-tweaks
...
Email template and admin tweaks
2017-10-13 17:10:08 +02:00
c1b83df5f6
Merge pull request #17174 from woocommerce/improve/17172
...
Add extra lines back in admin order summary
2017-10-13 15:24:51 +01:00
c2c213fe05
Include date in customer emails again
2017-10-13 15:09:21 +01:00
7df8f6bec6
Resend new order notification option
...
@kloon Stole your code.
Ref: #17186
2017-10-13 14:54:12 +01:00
ddf8abf474
Merge pull request #17189 from franticpsyx/add-missing-break-in-legacy-cart
...
[3.2] Add missing break in WC_Legacy_Cart class
2017-10-13 14:41:47 +01:00
d694483735
Fix tax display issue for discounts
2017-10-13 14:36:35 +01:00
98eeafcc29
Hide shipping/discount rows when not needed and match email wording.
2017-10-13 14:01:20 +01:00
803b31a18c
Switched to property_exists and moved deprecation notice to avoid errors and setting fees unnecessarily.
2017-10-13 13:46:49 +01:00
8fa6116ef6
Hide cat-parent class when category will show no children due to depth setting
...
Closes #17184
2017-10-13 12:50:49 +01:00
3562f7156a
Add missing break in WC_Legacy_Cart class
2017-10-13 14:17:13 +03:00
feffde2a73
Merge pull request #17167 from woocommerce/tweak/services-text-in-wizard
...
Tweak/services text in wizard
2017-10-13 11:32:51 +02:00
0146c7d240
Merge pull request #17164 from woocommerce/fix/17088
...
Fix image matching queries
2017-10-13 11:30:34 +02:00
b5e02ea6f6
Add extra lines back in admin order summary
2017-10-12 14:01:11 -07:00
8fa3ddde86
Tweaked intro text further about live rates
2017-10-12 18:29:23 +01:00
0f9bd218ed
Merge pull request #17160 from woocommerce/fix/17138
...
Use city and postcode count to determine sort order
2017-10-12 09:27:30 -07:00
a447221213
wc_setup_wcs_tout is not used.
2017-10-12 17:19:47 +01:00
a1f4cc0464
Show what powers taxes and link, just like storefront
2017-10-12 17:19:17 +01:00
cd0eb65852
Merge pull request #17162 from woocommerce/fix/17150
...
Fixed discount logic to also look at parent categories when validatiing coupons
2017-10-12 09:19:14 -07:00
9198d636c5
This installs jetpack/services - be clear
2017-10-12 17:18:37 +01:00
806f80c8d2
Be explicit about what powers live rates
2017-10-12 17:18:15 +01:00
a63c822d2d
Merge pull request #17161 from woocommerce/fix/17158
...
Remove rounding in wc_remove_number_precision
2017-10-12 08:48:32 -07:00
fb763a6deb
Merge pull request #17155 from woocommerce/fix/selectWoo-dependency
...
wc-admin-order-meta-boxes as a selectwoo dependency
2017-10-12 08:38:36 -07:00
b72268172a
Fix image matching queries
2017-10-12 16:32:40 +01:00
4379a47cd5
Fixed discount logic to also look at parent categories when validatiing coupons
...
Fixes #17150
2017-10-12 15:40:58 +01:00
88ea1eaf7b
Remove rounding in wc_remove_number_precision
...
Remove the rounding when removing precision so the cart can handle it.
For taxes, this means it can round down.
Fixes #17158
Tests are passing.
2017-10-12 15:16:48 +01:00
878e4816fb
Use city and postcode count to determine sort order
2017-10-12 14:04:10 +01:00
2db0d1d4d6
Merge pull request #17151 from woocommerce/fix/shipping-rate-save
...
Fix tax rate save when only changing shipping checkbox
2017-10-12 12:33:46 +01:00
cffcaaf773
wc-admin-order-meta-boxes as a selectwoo dependency
2017-10-12 12:32:36 +01:00
6aca58324a
Merge pull request #17152 from woocommerce/fix/lazy-load-embeds
...
Load videos when the help tab is opened, not before.
2017-10-12 12:28:00 +01:00
47d69dad2d
Load videos when the help tab is opened, not before.
...
Closes #17145
2017-10-12 12:18:37 +01:00
5a22c7fa97
Fix tax rate save when only changing shipping checkbox
2017-10-12 11:30:41 +01:00
0908bc0b13
phpcs
2017-10-12 11:26:55 +01:00
4f3393fc2f
Tax calculations should use `unfiltered` context for tax class
...
This fixes variations which have a ‘parent’ tax class. It should
inherit from the parent.
Closes #17147
2017-10-12 10:12:20 +01:00
a6059ea759
Remove menu-ordering sorting
2017-10-11 21:36:13 +01:00
dee7a8c8d4
If no tax rate is defined for a specific country it still shows "incl. VAT" at the checkout / cart when tax display is set to "As single total". This will solved that
2017-10-11 17:58:43 +02:00
1ccec7d156
class-wc-widget-layered-nav.php - Crawling Budget
...
Additional optimization to save up crawling budget.
Added $link = str_replace('%2C', ',', $link); on line 513
https://mydomain.com/produkt-kategorie/my-category/?filter_filter-color=orange,black
If you add another filter it encodes the existing commas:
https://mydomain.com/produkt-kategorie/my-category/?filter_filter-color=orange%2Cblack&filter_manufacturer=adidas&filter_cut=men.children
So sometimes you have "," as seperator and sometimes you have encoded "%2C".
After implementing this pull-request the seperator stays ",":
https://mydomain.com/produkt-kategorie/my-category/?filter_filter-farbe=orange,black&filter_manufacturer=adidas&filter_cut=men.children
This pull request belongs to the optimization https://github.com/woocommerce/woocommerce/pull/17134 to save up crawling budget,
2017-10-11 14:47:00 +02:00
12d93803ee
Merge pull request #17121 from woocommerce/update/wizard-payments-copy
...
Update payment step copy for Stripe, and fixes margins/spacing
2017-10-11 10:17:57 +01:00
d9f0bd5e92
Keep link structure - prevent duplicate content
...
Added asort($current_filter) so the urls always look the same and there are not millions of urls possibilities when adding multiple filters.
Current url example:
https://myurl.com/produkt-kategorie/mycategory/?filter_filter-color=yellow,brown,blue,red
https://myurl.com/produkt-kategorie/mycategory/?filter_filter-color=yellow,blue,red,brown
https://myurl.com/produkt-kategorie/mycategory/?filter_filter-color=blue,yellow,red,brown
...
With asort you only have this url:
https://myurl.com/produkt-kategorie/mycategory/?filter_filter-color=blue,brown,red,yellow
So it is independent on the sequence a user adds a filter
2017-10-11 08:33:46 +02:00
17e4f2a609
Merge pull request #17127 from woocommerce/fix/17122-setup-required-shipping-fields
...
Setup wizard - made the shipping cost fields required
2017-10-10 18:50:20 +02:00
01578d55c9
Wrapped the class name in esc_attr
2017-10-10 17:49:04 +01:00
eaf8a09e82
Setup wizard - made the shipping cost fields required
2017-10-10 16:59:08 +01:00
31367a72b8
Merge pull request #17123 from woocommerce/update/wizard-extras-copy
...
Setup wizard: add “powered by” to automated taxes description.
2017-10-10 16:39:45 +01:00
1474350f0f
Correct docblock @return
...
From incorrect `string` to correct `array`
2017-10-10 10:31:16 -05:00
24599524ba
Setup wizard: add “powered by” to automated taxes description.
2017-10-10 09:24:13 -06:00
6b357bcfdc
Updates the payment step copy and fixes margins
2017-10-10 15:40:03 +01:00
d4965e9df4
Merge pull request #17112 from woocommerce/fix/product-variations-tax-classes
...
Add 'parent' to the list of valid tax classes for product variations
2017-10-10 12:32:29 +01:00
24efd36126
set query_vars ( #17105 )
...
* query_vars is set
* add changes
2017-10-10 12:14:35 +01:00
974f402017
Fix duplicate plugin install from wizard. ( #17114 )
...
* Setup wizard: avoid duplicate plugin installs.
* Setup wizard: use background flag to determine if Jetpack is being installed.
* Setup wizard: use wc_set_time_limit() instead of set_time_limit() to avoid potential warnings/errors.
2017-10-09 16:45:33 -06:00
87cf8f4809
Merge pull request #17106 from woocommerce/fix/activate-step-when-returning-from-wpcom
...
Setup wizard: activate step shouldn't be hidden after a successful WPCOM connection.
2017-10-09 16:59:53 -03:00
fa0e5569f8
Add 'parent' to the list of valid tax classes for product variations
...
Commit d9f9e74bdFixes #17024
2017-10-09 16:20:03 -03:00
d769ef24f2
Coding standards fixes
2017-10-09 16:19:24 -03:00
6d7522d864
Merge pull request #17075 from woocommerce/fix/phpunit-excluded-files
...
Updated tests exclusion list
2017-10-09 19:46:34 +01:00
7ce5d9e1c6
Merge pull request #17109 from woocommerce/fix/17085-2
...
Translate "No matches found" message in filter widget
2017-10-09 15:39:51 -03:00
f1dac6f3ac
Use esc_js instead of addslashes
2017-10-09 11:37:09 -07:00
fae130d038
Allow display_name to be searchable - this will commonly be full name
...
Closes #17104
2017-10-09 19:20:22 +01:00
97d7ae7df8
Missing semicolon
2017-10-09 11:16:24 -07:00
2ccd44afa7
Translate "no matches" message
2017-10-09 11:10:32 -07:00
c5f097f319
Setup wizard: check for activate-step-specific GET parameters before hiding the step.
...
This was a bit overzealous, and broke successful connection flows from the wizard. (Introduced in 97faa49fc4
2017-10-09 08:55:30 -06:00
c16b950aa9
Merge pull request #17103 from woocommerce/fix/is_checkout_conditional
...
Add WOOCOMMERCE_CHECKOUT check to is_checkout
2017-10-09 13:18:09 +01:00
2080858dd4
Also check the woocommerce_checkout conditional, ensure ajax conditional checks keeps working. Closes #17094
2017-10-09 12:39:47 +02:00
74fb3821e2
Merge pull request #17096 from woocommerce/add/17092-jetpack-tos-accept-flag
...
Setup wizard: set a flag when Jetpack is opted into.
2017-10-09 11:39:32 +01:00
a815c62289
PHPCS fixes
2017-10-09 12:39:27 +02:00
000295c0bf
Setup wizard: remove the “activate” step if Jetpack is already connected. ( #17099 )
...
* Setup wizard: remove the “activate” step if Jetpack is already connected.
* phpcs
2017-10-09 11:35:17 +01:00
2b49125b46
Enable clearing for attribute filter widget ( #17093 )
...
* Enable clearing for attribute filter widget
* Multiselect variant doesnt need clear button
* Make code less ugly
2017-10-09 11:21:21 +01:00
4c66520989
Setup wizard: set a flag when Jetpack is opted into.
...
This is to be picked up by the WooCommerce Services extension.
2017-10-06 20:40:25 -06:00
70a72693c3
Helper: Fix automatic subscription activation
...
Fixes a bug where automatic subscription activation upon plugin
activation does not trigger due to the subscription being unlimited.
2017-10-06 17:12:55 +03:00
52beb782c6
Update class-wc-widget-layered-nav.php - Avoid duplicate content
...
Added rel="nofollow" to the filters to avoid duplicate content.
2017-10-05 19:55:10 +02:00
31f42ba907
Move includes/class-wc-legacy-api.php to includes/legacy/class-wc-legacy-api.php
2017-10-05 14:02:30 -03:00
18a47d79b1
Merge branch 'master' into add/formatting-unit-tests
2017-10-05 12:18:29 -03:00
8cd754d8b6
Fixed coding standards
2017-10-05 11:08:37 -03:00
77e245fa68
Merge pull request #17067 from woocommerce/fix/mexican-state-update
...
Update only state fields when updating Mexican States
2017-10-05 12:53:35 +01:00
b4088c5d91
Wizard: Handle Jetpack install, activate, and connection errors ( #16983 )
...
* Wizard: Remove extra query arg in next step URL
Remove the activate_error query arg from
the URL for the next step.
* Wizard: Remove temp queued Jetpack install option
This is done so that the option does not remain
when going through the wizard again, or when going
back to previous pages.
It prevents an infinite loop from happening when
waiting for the Jetpack install and activation
to finish on the activate step.
* Wizard: Install and activate Jetpack if needed
Add function to install & activate Jetpack as needed.
Props to @jeffstieler for the idea, and the implementation/code:
https://github.com/Automattic/woocommerce-services/pull/1031#discussion_r122505316
https://github.com/Automattic/jetpack/blob/master/3rd-party/woocommerce-services.php#L101
Add a list of errors and a function to get the correct error message.
After clicking the connect Jetpack button, make sure that
Jetpack is installed and activated.
On error, redirect to the activate page with a query arg.
* Wizard: Show Jetpack error message if it exists
Always check for an error message when displaying
the activate step. If the error
message exists, display it at the top of the page.
* Remove redundant "if" so the $title in the Activate step is always a valid string
* Tweaked the "Server is on a private network" Jetpack activation error message.
2017-10-05 12:51:49 +01:00
a8e3862bf2
Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066
2017-10-05 13:49:10 +02:00
71fce64f54
PHPCS fixes.
2017-10-05 13:48:26 +02:00
9ad6a41e7c
Revert "Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066 "
...
This reverts commit 2474396eb6
2017-10-05 13:46:45 +02:00
2474396eb6
Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066
...
This also fixes a bunch of PHPCS issues as it seems the new rules is very strict and you must fix the whole file before commiting any of your own changes.
2017-10-05 11:32:30 +02:00
61caed9cb8
Wizard: Add Stripe Email ( #17029 )
...
* Wizard: Add Stripe email input, show previously entered payment settings, only save settings for enabled gateways
2017-10-04 13:37:59 -06:00
b72ad3f2cc
Setup wizard: fix logic error when detecting existing shipping zones. ( #16995 )
...
* Setup wizard: fix logic error when detecting existing shipping zones.
* Hide the shipping zones sections on the Shipping step if there are already shipping zones configured in the store.
2017-10-04 11:48:06 -06:00
0dad12537b
Version was bumped
2017-10-04 12:54:00 -03:00
8b0400c348
Merge pull request #17060 from woocommerce/fix/17044
...
Ensure query_vars is set. Closes #17044
2017-10-04 11:52:12 -03:00
b25e08e1cc
Merge pull request #17058 from woocommerce/fix/17047-alt
...
Fix meta data returns in API using JsonSerializable
2017-10-04 11:48:46 -03:00
d72f6ae22c
Ensure query_vars is set. Closes #17044
2017-10-04 15:37:43 +01:00
7e06a30eea
Merge pull request #17042 from victorfreitas/fix_invalid_term
...
Fix bug when parent term is invalid
2017-10-04 14:55:12 +01:00
38434e3288
Merge pull request #17052 from shivapoudel/fix/footer-text
...
Fix - Admin footer text
2017-10-04 14:44:46 +01:00
f4e3498d4e
Handle JSON encoding for API
2017-10-04 14:12:53 +01:00
240a321dd0
Revert get_meta_data changes and return array of WC_Meta_Data objects
2017-10-04 14:12:43 +01:00
e26302b1ff
Nothing to be translated any more!
2017-10-04 13:11:44 +01:00
7c05dde430
Remove "Powered by WooCommerce" credit in default email footer text setting. closes #17053
2017-10-04 12:40:18 +01:00
7cd968c69b
Fix - Admin footer text
2017-10-04 15:33:22 +05:45
47d50a70ea
Merge pull request #16969 from stiletagegmbh/master
...
added actions and filters to modify tax calculation for shipping taxes and fee taxes #16938
2017-10-04 10:30:47 +01:00
ac24a56ff3
#16938 rename filter for clarity
2017-10-04 10:56:56 +02:00
e6710258d2
Merge pull request #17037 from victorfreitas/master
...
Save postmeta attachment image reference on import of products via AP rest.
2017-10-03 19:32:27 -03:00
9dcfe4883a
Fix error when invalid parent term
2017-10-03 17:59:58 -03:00
872fed68dc
Added to new actions in content-widget-product.php so plugins can easily and specifacally do sth within product widgets. There's no issue/reference, sorry.
2017-10-03 17:52:36 -03:00
c850bb92da
Merge pull request #17028 from woocommerce/minor-wizard-style-updates
...
Small style adjusts to onboarding
2017-10-03 13:27:59 -06:00
60e9258913
Wizard: Update option for types of product sold
2017-10-03 17:38:08 +02:00
3ca5ded150
Wizard: Reset live rates options on save
2017-10-03 17:30:00 +02:00
450236c8d9
Wizard: Update store setup text
2017-10-03 17:30:00 +02:00
9da7925288
Wizard: Fix paragraph bottom margin
...
Avoid too little bottom margin when the paragraph
is the last paragraph on the page, but not the last element.
Avoid too much bottom margin when there were nonce fields
after the last paragraph on the page.
2017-10-03 17:29:22 +02:00
e40ae14d2e
Improving the code comment
2017-10-03 12:28:05 -03:00
9a2ab72cd6
Wizard: Style tracking option
2017-10-03 17:26:32 +02:00
c72c2f06b8
Save postmeta attachment image reference on import of products via API rest.
2017-10-03 10:17:09 -03:00
ae17ccd65f
Fix typo
2017-10-03 15:34:44 +03:00
fb8bac5957
make hidden country/state readonly
...
make hidden country / state fields read only. fixes #17026
2017-10-02 15:24:37 -04:00
d3d782c85c
Merge pull request #17017 from woocommerce/fix/17003
...
Handle WC_Meta_Data in get_data() and API
2017-10-02 09:19:45 -07:00
fe819a8be2
Merge pull request #17021 from woocommerce/fix/17004
...
Allow wc_get_formatted_variation to skip attributes used in the variation's name
2017-10-02 13:10:31 -03:00
590838eb82
Merge pull request #17015 from woocommerce/fix/17014
...
Check `$item->url` is set.
2017-10-02 09:10:16 -07:00
8eb500b8c1
Allow wc_get_formatted_variation to skip attributes used in the variation's name
...
Alternative fix for #17004
This matches the cart logic.
2017-10-02 15:50:10 +01:00
f16b44a9c2
Merge pull request #17019 from woocommerce/fix/pdt
...
Improved PDT handling and logs
2017-10-02 11:41:47 -03:00
68f75e9395
Merge pull request #16997 from woocommerce/fix/cart_contents-is-array
...
Treat values in cart_contents hash as arrays instead of objects
2017-10-02 14:58:13 +01:00
c15491b9ad
Improved PDT handling and logs
2017-10-02 14:24:39 +01:00
5256f5e91e
Merge pull request #17007 from grosssmutttr/patch-1
...
Update WC_Widget_Layered_Nav_Filters
2017-10-02 13:35:30 +01:00
4b81951aa8
Merge pull request #17016 from woocommerce/update/embeds
...
Filter oEmbeds for certain post types
2017-10-02 09:27:26 -03:00
7460189752
Handle WC_Meta_Data in get_data() and API
...
Fixes #17003
2017-10-02 13:12:33 +01:00
84a15d1110
Filter oEmbeds for certain post types
...
Orders and coupons have no use for embeds so disable them.
2017-10-02 12:36:58 +01:00
4071a7821f
Check `$item->url` is set.
...
Closes #17014
2017-10-02 11:41:44 +01:00
a4332486c8
pass false to create param of wp_upload_dir, we only need the location, do not want the folder to be created. This fixes warnings on read-only filesystems.
2017-10-02 08:37:07 +02:00
146fdff506
Update WC_Widget_Layered_Nav_Filters
...
Add rel="nofollow" to the URLs to avoid duplicate content.
2017-10-01 11:41:22 +02:00
7e9e58d75f
Merge pull request #16998 from woocommerce/fix/16992
...
[Importer] Do not override stock_status when already declared
2017-09-29 13:23:28 -07:00
fecff53353
[Importer] Do not override stock_status when already declared
...
And fixed a few coding standards because the pre-commit hook.
Fixes #16992
2017-09-29 16:07:15 -03:00
3709abb1b6
Merge pull request #16996 from woocommerce/fix/undefined-variable
...
Define the variable in case the flow doesn't branch
2017-09-29 15:19:18 -03:00
71305b131f
Treat values in cart_contents hash as arrays instead of objects
2017-09-29 18:46:34 +02:00
9869503ed5
Define the variable in case the flow doesn't branch
2017-09-29 18:16:26 +02:00
a509161724
Merge pull request #16991 from woocommerce/fix/16988
...
Just use home_url for wc-ajax requests
2017-09-29 11:42:08 -03:00
fbe6db5c02
Just use home_url for wc-ajax requests
2017-09-29 15:08:14 +01:00
8a95d1111b
Text changes
2017-09-29 10:47:07 +01:00
Claudio Sanches
Mike Jolley
Dan Wyman
claudiulodro
Umangvaghela
Will Gorham
Hisman
JeroenSormani
Gerhard Potgieter
Manos Psychogyiopoulos
Chris Schrijver
grosssmutttr
Marcin Bot
Marcin Bot
Clifford
Jeff Stieler
Jack
Rodrigo Primo
Konstantin Kovshenin
Valerie K
Filipe Seabra
James Koster
Shiva Poudel
lars
victorfreitas
Ville Viklund
Lane Goldberg
Boro Sitnikovski
SGroupGeorge