Changeset 2873586
- Timestamp:
- 03/02/2023 11:21:23 AM (3 years ago)
- Location:
- woorule
- Files:
-
- 10 edited
- 1 copied
-
tags/3.0.0 (copied) (copied from woorule/trunk)
-
tags/3.0.0/README.txt (modified) (2 diffs)
-
tags/3.0.0/inc/class-rulemailer-api.php (modified) (1 diff)
-
tags/3.0.0/inc/class-woorule-cart-hooks.php (modified) (7 diffs)
-
tags/3.0.0/languages/woorule.pot (modified) (2 diffs)
-
tags/3.0.0/woorule.php (modified) (2 diffs)
-
trunk/README.txt (modified) (2 diffs)
-
trunk/inc/class-rulemailer-api.php (modified) (1 diff)
-
trunk/inc/class-woorule-cart-hooks.php (modified) (7 diffs)
-
trunk/languages/woorule.pot (modified) (2 diffs)
-
trunk/woorule.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
woorule/tags/3.0.0/README.txt
r2790316 r2873586 5 5 Tested up to: 6.0 6 6 Requires PHP: 5.6+ 7 Stable tag: 2.8.07 Stable tag: 3.0.0 8 8 License: MIT 9 9 License URI: http://opensource.org/licenses/MIT … … 109 109 For more information, check out our [releases](https://github.com/rulecom/woorule/releases). 110 110 111 = 2.7.8 = 111 = 3.0.0 = 112 * Updated flow for CartInProgress tags to follow our best practices. Read below what you need to adjust if you use this function. 113 * Changed CartInProgress so it will save to custom group Cart instead of Order. Prepare your automations in Rule that triggers on CartInProgress so they will use data from Cart group. 114 * When making above change take into consideration your interval on the automations. Triggers created before the upgrade will still have their data in Order group. 115 * These changes will create a more accurate history of your orders in Rule while separating unfinished carts into their own data set. 116 117 = 2.8.0 = 112 118 * Added product alert functionality 113 119 -
woorule/tags/3.0.0/inc/class-rulemailer-api.php
r2790316 r2873586 22 22 use Woorule_Logging; 23 23 24 const URL = 'https://app.rule.io/api/v2/subscribers?source=woorule&version= 2.8.0';24 const URL = 'https://app.rule.io/api/v2/subscribers?source=woorule&version=3.0.0'; 25 25 26 26 /** -
woorule/tags/3.0.0/inc/class-woorule-cart-hooks.php
r2719394 r2873586 131 131 132 132 foreach ( $fields as $key => $field ) { 133 if ( ' Order.BillingTele' === $field['key'] ) {133 if ( 'Cart.BillingTele' === $field['key'] ) { 134 134 unset( $fields[ $key ] ); 135 135 } … … 214 214 return array( 215 215 array( 216 'key' => 'Order.Number', 217 'value' => null, 218 ), 219 array( 220 'key' => 'Order.Date', 216 'key' => 'Cart.Date', 221 217 'value' => gmdate( 'Y-m-d H:i:s' ), 222 218 'type' => 'datetime', 223 219 ), 224 220 array( 225 'key' => ' Order.Subtotal',221 'key' => 'Cart.Subtotal', 226 222 'value' => Woorule_Utils::round( WC()->cart->get_subtotal() ), 227 223 ), 228 224 array( 229 'key' => ' Order.SubtotalVat',225 'key' => 'Cart.SubtotalVat', 230 226 'value' => Woorule_Utils::round( WC()->cart->get_subtotal() + WC()->cart->get_cart_contents_tax() ), 231 227 ), 232 228 array( 233 'key' => ' Order.Discount',229 'key' => 'Cart.Discount', 234 230 'value' => Woorule_Utils::round( WC()->cart->get_discount_total() ), 235 231 ), 236 232 array( 237 'key' => ' Order.Shipping',233 'key' => 'Cart.Shipping', 238 234 'value' => Woorule_Utils::round( WC()->cart->get_shipping_total() ), 239 235 ), 240 236 array( 241 'key' => ' Order.ShippingVat',237 'key' => 'Cart.ShippingVat', 242 238 'value' => Woorule_Utils::round( WC()->cart->get_shipping_total() + WC()->cart->get_shipping_tax() ), 243 239 ), 244 240 array( 245 'key' => ' Order.Total',241 'key' => 'Cart.Total', 246 242 'value' => Woorule_Utils::round( WC()->cart->get_total( null ) ), 247 243 ), 248 244 array( 249 'key' => ' Order.Vat',245 'key' => 'Cart.Vat', 250 246 'value' => Woorule_Utils::round( WC()->cart->get_total_tax() ), 251 247 ), 252 248 array( 253 'key' => ' Order.Currency',249 'key' => 'Cart.Currency', 254 250 'value' => get_woocommerce_currency(), 255 251 ), 256 252 array( 257 'key' => ' Order.PaymentMethod',253 'key' => 'Cart.PaymentMethod', 258 254 'value' => null, 259 255 'type' => 'multiple', 260 256 ), 261 257 array( 262 'key' => ' Order.DeliveryMethod',258 'key' => 'Cart.DeliveryMethod', 263 259 'value' => null, 264 260 'type' => 'multiple', 265 261 ), 266 262 array( 267 'key' => ' Order.BillingFirstname',263 'key' => 'Cart.BillingFirstname', 268 264 'value' => $this->current_customer->get_billing_first_name(), 269 265 ), 270 266 array( 271 'key' => ' Order.BillingLastname',267 'key' => 'Cart.BillingLastname', 272 268 'value' => $this->current_customer->get_billing_last_name(), 273 269 ), 274 270 array( 275 'key' => ' Order.BillingStreet',271 'key' => 'Cart.BillingStreet', 276 272 'value' => $this->current_customer->get_billing_address_1(), 277 273 ), 278 274 array( 279 'key' => ' Order.BillingCity',275 'key' => 'Cart.BillingCity', 280 276 'value' => $this->current_customer->get_billing_city(), 281 277 ), 282 278 array( 283 'key' => ' Order.BillingZipcode',279 'key' => 'Cart.BillingZipcode', 284 280 'value' => $this->current_customer->get_billing_postcode(), 285 281 ), 286 282 array( 287 'key' => ' Order.BillingState',283 'key' => 'Cart.BillingState', 288 284 'value' => $this->current_customer->get_billing_state(), 289 285 ), 290 286 array( 291 'key' => ' Order.BillingCountry',287 'key' => 'Cart.BillingCountry', 292 288 'value' => $this->current_customer->get_billing_country(), 293 289 ), 294 290 array( 295 'key' => ' Order.BillingTele',291 'key' => 'Cart.BillingTele', 296 292 'value' => Woorule_Utils::get_customer_phone_number( $this->current_customer ), 297 293 ), 298 294 array( 299 'key' => ' Order.BillingCompany',295 'key' => 'Cart.BillingCompany', 300 296 'value' => $this->current_customer->get_billing_company(), 301 297 ), 302 298 array( 303 'key' => ' Order.CartUrl',299 'key' => 'Cart.CartUrl', 304 300 'value' => wc_get_cart_url(), 305 301 ), … … 320 316 if ( ! empty( $brands ) ) { 321 317 $order_items_fields[] = array( 322 'key' => ' Order.Brands',318 'key' => 'Cart.Brands', 323 319 'value' => $brands, 324 320 'type' => 'multiple', … … 328 324 if ( ! empty( $items_data['categories'] ) ) { 329 325 $order_items_fields[] = array( 330 'key' => ' Order.Collections',326 'key' => 'Cart.Collections', 331 327 'value' => $items_data['categories'], 332 328 'type' => 'multiple', … … 336 332 if ( ! empty( $items_data['tags'] ) ) { 337 333 $order_items_fields[] = array( 338 'key' => ' Order.Tags',334 'key' => 'Cart.Tags', 339 335 'value' => $items_data['tags'], 340 336 'type' => 'multiple', … … 344 340 if ( ! empty( $items_data['products'] ) ) { 345 341 $order_items_fields[] = array( 346 'key' => ' Order.Products',342 'key' => 'Cart.Products', 347 343 'value' => wp_json_encode( $items_data['products'] ), 348 344 'type' => 'json', … … 352 348 if ( ! empty( $products_names ) ) { 353 349 $order_items_fields[] = array( 354 'key' => ' Order.Names',350 'key' => 'Cart.Names', 355 351 'value' => $products_names, 356 352 'type' => 'multiple', -
woorule/tags/3.0.0/languages/woorule.pot
r2790316 r2873586 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: WooRule 2.8.0\n"5 "Project-Id-Version: WooRule 3.0.0\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woorule\n" 7 7 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 12 12 "POT-Creation-Date: 2022-02-02T11:13:33+03:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 "X-Generator: WP-CLI 2. 8.0\n"14 "X-Generator: WP-CLI 2.6.0\n" 15 15 "X-Domain: woorule\n" 16 16 -
woorule/tags/3.0.0/woorule.php
r2790316 r2873586 9 9 * Plugin URI: http://github.com/rulecom/woorule 10 10 * Description: Rule integration for WooCommerce 11 * Version: 2.8.011 * Version: 3.0.0 12 12 * Author: Rule 13 13 * Author URI: http://rule.se … … 21 21 */ 22 22 23 define( 'WOORULE_VERSION', ' 2.8.0' );23 define( 'WOORULE_VERSION', '3.0.0' ); 24 24 define( 'WOORULE_PATH', plugin_dir_path( __FILE__ ) ); 25 25 define( 'WOORULE_URL', plugin_dir_url( __FILE__ ) ); -
woorule/trunk/README.txt
r2790316 r2873586 5 5 Tested up to: 6.0 6 6 Requires PHP: 5.6+ 7 Stable tag: 2.8.07 Stable tag: 3.0.0 8 8 License: MIT 9 9 License URI: http://opensource.org/licenses/MIT … … 109 109 For more information, check out our [releases](https://github.com/rulecom/woorule/releases). 110 110 111 = 2.7.8 = 111 = 3.0.0 = 112 * Updated flow for CartInProgress tags to follow our best practices. Read below what you need to adjust if you use this function. 113 * Changed CartInProgress so it will save to custom group Cart instead of Order. Prepare your automations in Rule that triggers on CartInProgress so they will use data from Cart group. 114 * When making above change take into consideration your interval on the automations. Triggers created before the upgrade will still have their data in Order group. 115 * These changes will create a more accurate history of your orders in Rule while separating unfinished carts into their own data set. 116 117 = 2.8.0 = 112 118 * Added product alert functionality 113 119 -
woorule/trunk/inc/class-rulemailer-api.php
r2790316 r2873586 22 22 use Woorule_Logging; 23 23 24 const URL = 'https://app.rule.io/api/v2/subscribers?source=woorule&version= 2.8.0';24 const URL = 'https://app.rule.io/api/v2/subscribers?source=woorule&version=3.0.0'; 25 25 26 26 /** -
woorule/trunk/inc/class-woorule-cart-hooks.php
r2719394 r2873586 131 131 132 132 foreach ( $fields as $key => $field ) { 133 if ( ' Order.BillingTele' === $field['key'] ) {133 if ( 'Cart.BillingTele' === $field['key'] ) { 134 134 unset( $fields[ $key ] ); 135 135 } … … 214 214 return array( 215 215 array( 216 'key' => 'Order.Number', 217 'value' => null, 218 ), 219 array( 220 'key' => 'Order.Date', 216 'key' => 'Cart.Date', 221 217 'value' => gmdate( 'Y-m-d H:i:s' ), 222 218 'type' => 'datetime', 223 219 ), 224 220 array( 225 'key' => ' Order.Subtotal',221 'key' => 'Cart.Subtotal', 226 222 'value' => Woorule_Utils::round( WC()->cart->get_subtotal() ), 227 223 ), 228 224 array( 229 'key' => ' Order.SubtotalVat',225 'key' => 'Cart.SubtotalVat', 230 226 'value' => Woorule_Utils::round( WC()->cart->get_subtotal() + WC()->cart->get_cart_contents_tax() ), 231 227 ), 232 228 array( 233 'key' => ' Order.Discount',229 'key' => 'Cart.Discount', 234 230 'value' => Woorule_Utils::round( WC()->cart->get_discount_total() ), 235 231 ), 236 232 array( 237 'key' => ' Order.Shipping',233 'key' => 'Cart.Shipping', 238 234 'value' => Woorule_Utils::round( WC()->cart->get_shipping_total() ), 239 235 ), 240 236 array( 241 'key' => ' Order.ShippingVat',237 'key' => 'Cart.ShippingVat', 242 238 'value' => Woorule_Utils::round( WC()->cart->get_shipping_total() + WC()->cart->get_shipping_tax() ), 243 239 ), 244 240 array( 245 'key' => ' Order.Total',241 'key' => 'Cart.Total', 246 242 'value' => Woorule_Utils::round( WC()->cart->get_total( null ) ), 247 243 ), 248 244 array( 249 'key' => ' Order.Vat',245 'key' => 'Cart.Vat', 250 246 'value' => Woorule_Utils::round( WC()->cart->get_total_tax() ), 251 247 ), 252 248 array( 253 'key' => ' Order.Currency',249 'key' => 'Cart.Currency', 254 250 'value' => get_woocommerce_currency(), 255 251 ), 256 252 array( 257 'key' => ' Order.PaymentMethod',253 'key' => 'Cart.PaymentMethod', 258 254 'value' => null, 259 255 'type' => 'multiple', 260 256 ), 261 257 array( 262 'key' => ' Order.DeliveryMethod',258 'key' => 'Cart.DeliveryMethod', 263 259 'value' => null, 264 260 'type' => 'multiple', 265 261 ), 266 262 array( 267 'key' => ' Order.BillingFirstname',263 'key' => 'Cart.BillingFirstname', 268 264 'value' => $this->current_customer->get_billing_first_name(), 269 265 ), 270 266 array( 271 'key' => ' Order.BillingLastname',267 'key' => 'Cart.BillingLastname', 272 268 'value' => $this->current_customer->get_billing_last_name(), 273 269 ), 274 270 array( 275 'key' => ' Order.BillingStreet',271 'key' => 'Cart.BillingStreet', 276 272 'value' => $this->current_customer->get_billing_address_1(), 277 273 ), 278 274 array( 279 'key' => ' Order.BillingCity',275 'key' => 'Cart.BillingCity', 280 276 'value' => $this->current_customer->get_billing_city(), 281 277 ), 282 278 array( 283 'key' => ' Order.BillingZipcode',279 'key' => 'Cart.BillingZipcode', 284 280 'value' => $this->current_customer->get_billing_postcode(), 285 281 ), 286 282 array( 287 'key' => ' Order.BillingState',283 'key' => 'Cart.BillingState', 288 284 'value' => $this->current_customer->get_billing_state(), 289 285 ), 290 286 array( 291 'key' => ' Order.BillingCountry',287 'key' => 'Cart.BillingCountry', 292 288 'value' => $this->current_customer->get_billing_country(), 293 289 ), 294 290 array( 295 'key' => ' Order.BillingTele',291 'key' => 'Cart.BillingTele', 296 292 'value' => Woorule_Utils::get_customer_phone_number( $this->current_customer ), 297 293 ), 298 294 array( 299 'key' => ' Order.BillingCompany',295 'key' => 'Cart.BillingCompany', 300 296 'value' => $this->current_customer->get_billing_company(), 301 297 ), 302 298 array( 303 'key' => ' Order.CartUrl',299 'key' => 'Cart.CartUrl', 304 300 'value' => wc_get_cart_url(), 305 301 ), … … 320 316 if ( ! empty( $brands ) ) { 321 317 $order_items_fields[] = array( 322 'key' => ' Order.Brands',318 'key' => 'Cart.Brands', 323 319 'value' => $brands, 324 320 'type' => 'multiple', … … 328 324 if ( ! empty( $items_data['categories'] ) ) { 329 325 $order_items_fields[] = array( 330 'key' => ' Order.Collections',326 'key' => 'Cart.Collections', 331 327 'value' => $items_data['categories'], 332 328 'type' => 'multiple', … … 336 332 if ( ! empty( $items_data['tags'] ) ) { 337 333 $order_items_fields[] = array( 338 'key' => ' Order.Tags',334 'key' => 'Cart.Tags', 339 335 'value' => $items_data['tags'], 340 336 'type' => 'multiple', … … 344 340 if ( ! empty( $items_data['products'] ) ) { 345 341 $order_items_fields[] = array( 346 'key' => ' Order.Products',342 'key' => 'Cart.Products', 347 343 'value' => wp_json_encode( $items_data['products'] ), 348 344 'type' => 'json', … … 352 348 if ( ! empty( $products_names ) ) { 353 349 $order_items_fields[] = array( 354 'key' => ' Order.Names',350 'key' => 'Cart.Names', 355 351 'value' => $products_names, 356 352 'type' => 'multiple', -
woorule/trunk/languages/woorule.pot
r2790316 r2873586 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: WooRule 2.8.0\n"5 "Project-Id-Version: WooRule 3.0.0\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woorule\n" 7 7 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 12 12 "POT-Creation-Date: 2022-02-02T11:13:33+03:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 "X-Generator: WP-CLI 2. 8.0\n"14 "X-Generator: WP-CLI 2.6.0\n" 15 15 "X-Domain: woorule\n" 16 16 -
woorule/trunk/woorule.php
r2790316 r2873586 9 9 * Plugin URI: http://github.com/rulecom/woorule 10 10 * Description: Rule integration for WooCommerce 11 * Version: 2.8.011 * Version: 3.0.0 12 12 * Author: Rule 13 13 * Author URI: http://rule.se … … 21 21 */ 22 22 23 define( 'WOORULE_VERSION', ' 2.8.0' );23 define( 'WOORULE_VERSION', '3.0.0' ); 24 24 define( 'WOORULE_PATH', plugin_dir_path( __FILE__ ) ); 25 25 define( 'WOORULE_URL', plugin_dir_url( __FILE__ ) );
Note: See TracChangeset
for help on using the changeset viewer.