Changeset 2971479
- Timestamp:
- 09/25/2023 05:50:16 PM (3 years ago)
- Location:
- doppler-for-woocommerce
- Files:
-
- 67 added
- 10 edited
-
tags/1.2.0 (added)
-
tags/1.2.0/LICENSE.txt (added)
-
tags/1.2.0/README.txt (added)
-
tags/1.2.0/admin (added)
-
tags/1.2.0/admin/class-doppler-for-woocommerce-admin.php (added)
-
tags/1.2.0/admin/css (added)
-
tags/1.2.0/admin/css/doppler-for-woocommerce-admin.css (added)
-
tags/1.2.0/admin/css/doppler-for-woocommerce-admin.scss (added)
-
tags/1.2.0/admin/css/fonts (added)
-
tags/1.2.0/admin/css/fonts.css (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-Bold.eot (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-Bold.ttf (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-Bold.woff (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-BoldIt.eot (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-BoldIt.ttf (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-BoldIt.woff (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-Regular.eot (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-Regular.ttf (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-Regular.woff (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-RegularIt.eot (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-RegularIt.ttf (added)
-
tags/1.2.0/admin/css/fonts/ProximaNova-RegularIt.woff (added)
-
tags/1.2.0/admin/img (added)
-
tags/1.2.0/admin/img/ajax-synch.gif (added)
-
tags/1.2.0/admin/img/icon-doppler-menu.png (added)
-
tags/1.2.0/admin/img/loading.gif (added)
-
tags/1.2.0/admin/img/logo-doppler.svg (added)
-
tags/1.2.0/admin/index.php (added)
-
tags/1.2.0/admin/js (added)
-
tags/1.2.0/admin/js/doppler-for-woocommerce-admin.js (added)
-
tags/1.2.0/admin/partials (added)
-
tags/1.2.0/admin/partials/doppler-for-woocommerce-settings.php (added)
-
tags/1.2.0/admin/partials/hub.php (added)
-
tags/1.2.0/admin/partials/lists.php (added)
-
tags/1.2.0/admin/partials/mapping.php (added)
-
tags/1.2.0/doppler-for-woocommerce.php (added)
-
tags/1.2.0/includes (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-ac.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-activator.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-admin-notice.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-app-connect.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-deactivator.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-dependency-check.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-i18n.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-loader.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-rest-controller.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce-visited-products.php (added)
-
tags/1.2.0/includes/class-doppler-for-woocommerce.php (added)
-
tags/1.2.0/includes/index.php (added)
-
tags/1.2.0/index.php (added)
-
tags/1.2.0/languages (added)
-
tags/1.2.0/languages/doppler-for-woocommerce-es_AR.mo (added)
-
tags/1.2.0/languages/doppler-for-woocommerce-es_AR.po (added)
-
tags/1.2.0/languages/doppler-for-woocommerce-es_ES.mo (added)
-
tags/1.2.0/languages/doppler-for-woocommerce-es_ES.po (added)
-
tags/1.2.0/languages/doppler-for-woocommerce.pot (added)
-
tags/1.2.0/public (added)
-
tags/1.2.0/public/class-doppler-for-woocommerce-public.php (added)
-
tags/1.2.0/public/css (added)
-
tags/1.2.0/public/css/doppler-for-woocommerce-public.css (added)
-
tags/1.2.0/public/css/doppler-for-woocommerce-public.scss (added)
-
tags/1.2.0/public/index.php (added)
-
tags/1.2.0/public/js (added)
-
tags/1.2.0/public/js/doppler-for-woocommerce-public.js (added)
-
tags/1.2.0/public/partials (added)
-
tags/1.2.0/public/partials/doppler-for-woocommerce-public-display.php (added)
-
tags/1.2.0/uninstall.php (added)
-
trunk/README.txt (modified) (2 diffs)
-
trunk/admin/class-doppler-for-woocommerce-admin.php (modified) (8 diffs)
-
trunk/admin/css/doppler-for-woocommerce-admin.css (modified) (1 diff)
-
trunk/admin/partials/mapping.php (modified) (3 diffs)
-
trunk/doppler-for-woocommerce.php (modified) (2 diffs)
-
trunk/languages/doppler-for-woocommerce-es_AR.mo (modified) (previous)
-
trunk/languages/doppler-for-woocommerce-es_AR.po (modified) (2 diffs)
-
trunk/languages/doppler-for-woocommerce-es_ES.mo (modified) (previous)
-
trunk/languages/doppler-for-woocommerce-es_ES.po (modified) (3 diffs)
-
trunk/languages/doppler-for-woocommerce.pot (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
doppler-for-woocommerce/trunk/README.txt
r2897819 r2971479 5 5 Requires at least: 4.9 6 6 Tested up to: 6.2 7 Stable tag: 1. 1.77 Stable tag: 1.2.0 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 12 12 13 13 Submit your WooCommerce customers and buyers to a Doppler List. 14 == 1.2.0 == 15 * Mapping of last puchased products 14 16 == 1.1.7 == 15 17 * Fix abandoned cart's product price when using taxes -
doppler-for-woocommerce/trunk/admin/class-doppler-for-woocommerce-admin.php
r2753293 r2971479 1 <?php1 <?php 2 2 3 3 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly … … 332 332 */ 333 333 public function reset_buyers_and_contacts_last_synch() { 334 334 335 $last_synch = get_option('dplrwoo_last_synch'); 335 336 … … 397 398 WC()->session = new WC_Session_Handler; 398 399 WC()->customer = new WC_Customer; 399 return WC()->checkout->checkout_fields; 400 } 400 401 //checkout from woocommerce 402 $fields = WC()->checkout->checkout_fields; 403 404 $last_product = array( "product_names" => array("label" => "Products", 405 "required" => true, 406 "class" => array("form-row-first"), 407 "autocomplete" => "products_names", 408 "type" => "string", 409 "priority"=>10), 410 "product_total" => array("label" => "Total amount", 411 "required" => true, 412 "class" => array("form-row-first"), 413 "autocomplete" => "total_ammount", 414 "type" => "number", 415 "priority"=>20), 416 "product_date" => array("label" => "Date of purchase", 417 "required" => true, 418 "class" => array("form-row-first"), 419 "autocomplete" => "date_of_purchase", 420 "type" => "date", 421 "priority"=>30)); 422 423 $fields["product"] = $last_product; 424 425 return $fields; 426 } 427 401 428 402 429 /** … … 819 846 $query = "SELECT p.ID, pm.meta_value as email FROM ".$wpdb->prefix."posts p "; 820 847 $query.= "JOIN ".$wpdb->prefix."postmeta pm ON p.ID = pm.post_id "; 821 $query.= "WHERE post_type = 'shop_order' AND p .post_status!='wc-completed' AND pm.meta_key = '_billing_email' AND pm.meta_value != '' ";848 $query.= "WHERE post_type = 'shop_order' AND pm.meta_key = '_billing_email' AND pm.meta_value != '' "; 822 849 $query.= $condition_orders; 823 850 $query.= "ORDER BY p.ID ASC LIMIT 150"; … … 914 941 */ 915 942 public function show_admin_notice() { 916 $class = $this->admin_notice[0];917 $text = $this->admin_notice[1];943 if(isset($this->admin_notice[0])) $class = $this->admin_notice[0]; 944 if(isset($this->admin_notice[1])) $text = $this->admin_notice[1]; 918 945 if( !empty($class) && !empty($text) ){ 919 946 ?> … … 937 964 //Map default fields. 938 965 foreach($order_data as $key=>$fieldgroup){ 939 if( $key === 'shipping' || $key === 'billing' ){966 if( $key === 'shipping' || $key === 'billing'){ 940 967 foreach($fieldgroup as $fieldname=>$v){ 941 968 $f = $key.'_'.$fieldname; … … 966 993 } 967 994 } 995 996 if(!empty($fields_map)){ 997 foreach($fields_map as $wc_field=>$dplr_field){ 998 // changes requested on ticket ID:1009 999 if(!empty($dplr_field)){ 1000 if($wc_field == 'product_total'){ 1001 $fields[] = array('name'=>$dplr_field, 'value'=>$order->get_total()); 1002 } 1003 else if($wc_field == 'product_date'){ 1004 $fields[] = array('name'=>$dplr_field, 'value'=>$order->get_date_created()->format('Y-m-d')); 1005 } 1006 else if($wc_field == 'product_names'){ 1007 $items = $order->get_items(); 1008 foreach ($items as $item_id => $item) { 1009 $product_names[] = $item->get_name(); 1010 } 1011 $product_names_st = implode(', ', $product_names); 1012 $fields[] = array('name'=>$dplr_field, 'value'=>$product_names_st); 1013 } 1014 } 1015 } 1016 } 1017 968 1018 return $fields; 969 1019 } … … 1235 1285 <?php 1236 1286 } 1287 1288 1237 1289 } -
doppler-for-woocommerce/trunk/admin/css/doppler-for-woocommerce-admin.css
r2326627 r2971479 22 22 font-weight: 700; 23 23 display: inline-block; } 24 25 .mapping-th-left { 26 width: 60%; 27 } 24 28 25 29 /** -
doppler-for-woocommerce/trunk/admin/partials/mapping.php
r2753293 r2971479 46 46 _e('Account fields', 'doppler-for-woocommerce'); 47 47 break; 48 case 'product': 49 _e('Last purchase fields', 'doppler-for-woocommerce'); 50 break; 48 51 default: 49 52 echo esc_html($fieldtype); … … 54 57 </tr> 55 58 <tr> 56 <th class=" text-left pt-1 pb-1"><?php _e('WooCommerce Fields','doppler-for-woocommerce') ?></th>59 <th class="mapping-th-left text-left pt-1 pb-1"><?php _e('WooCommerce Fields','doppler-for-woocommerce') ?></th> 57 60 <th class="text-left pt-1 pb-1"><?php _e('Doppler Fields', 'doppler-for-woocommerce') ?></th> 58 61 </tr> … … 67 70 ?> 68 71 <tr> 69 <td><?php echo $fieldAtributes['label']?></td> 72 <td> 73 <?php 74 if($fieldtype==='product'): 75 _e($fieldAtributes['label'], 'doppler-for-woocommerce'); 76 else: 77 echo $fieldAtributes['label']; 78 endif; ?> 79 </td> 70 80 <td> 71 81 <select class="dplrwoo-mapping-fields" name="dplrwoo_mapping[<?php echo $fieldname?>]" data-type="<?php if (isset($fieldAtributes['type'])) echo $fieldAtributes['type'] ?>"> -
doppler-for-woocommerce/trunk/doppler-for-woocommerce.php
r2897829 r2971479 17 17 * Plugin URI: https://www.fromdoppler.com/ 18 18 * Description: Connect your WooCommerce customers with your Doppler Lists. 19 * Version: 1. 1.719 * Version: 1.2.0 20 20 * Author: Doppler LLC 21 21 * License: GPL-2.0+ … … 35 35 * Rename this for your plugin and update it as you release new versions. 36 36 */ 37 define( 'DOPPLER_FOR_WOOCOMMERCE_VERSION', '1. 1.7' );37 define( 'DOPPLER_FOR_WOOCOMMERCE_VERSION', '1.2.0' ); 38 38 define( 'DOPPLER_FOR_WOOCOMMERCE_URL', plugin_dir_url(__FILE__)); 39 39 define( 'DOPPLER_FOR_WOOCOMMERCE_PLUGIN_DIR_PATH', plugin_dir_path( __FILE__ )); -
doppler-for-woocommerce/trunk/languages/doppler-for-woocommerce-es_AR.po
r2753293 r2971479 271 271 msgstr "Campos de Cuenta" 272 272 273 #: admin/partials/mapping.php:49 274 msgid "Last purchase fields" 275 msgstr "Campos de Ultima Compra" 276 273 277 #: admin/partials/mapping.php:56 274 278 msgid "WooCommerce Fields" … … 278 282 msgid "Doppler Fields" 279 283 msgstr "Campos de Doppler" 284 285 #: admin/partials/mapping.php:75 286 msgid "Products" 287 msgstr "Productos" 288 289 #: admin/partials/mapping.php:75 290 msgid "Total amount" 291 msgstr "Monto total" 292 293 #: admin/partials/mapping.php:75 294 msgid "Date of purchase" 295 msgstr "Fecha de compra" 280 296 281 297 #: admin/partials/mapping.php:111 -
doppler-for-woocommerce/trunk/languages/doppler-for-woocommerce-es_ES.po
r2753293 r2971479 271 271 msgstr "Campos de Cuenta" 272 272 273 #: admin/partials/mapping.php:49 274 msgid "Last purchase fields" 275 msgstr "Campos de Ultima Compra" 276 273 277 #: admin/partials/mapping.php:56 274 278 msgid "WooCommerce Fields" … … 278 282 msgid "Doppler Fields" 279 283 msgstr "Campos de Doppler" 284 285 #: admin/partials/mapping.php:75 286 msgid "Products" 287 msgstr "Productos" 288 289 #: admin/partials/mapping.php:75 290 msgid "Total amount" 291 msgstr "Monto total" 292 293 #: admin/partials/mapping.php:75 294 msgid "Date of purchase" 295 msgstr "Fecha de compra" 280 296 281 297 #: admin/partials/mapping.php:111 … … 397 413 #~ msgid "It'll be deleted and can't be recovered." 398 414 #~ msgstr "Será eliminada y no puede ser recuperada." 415 416 #~ msgid "Products" 417 #~ msgstr "Productos" 418 419 #~ msgid "Total amount" 420 #~ msgstr "Monto total" 421 422 #~ msgid "Date of purchase" 423 #~ msgstr "Fecha de compra" -
doppler-for-woocommerce/trunk/languages/doppler-for-woocommerce.pot
r2326627 r2971479 340 340 msgstr "" 341 341 342 #: admin/partials/mapping.php:49 343 msgid "Last purchase fields" 344 msgstr "" 345 342 346 #: admin/partials/mapping.php:56 343 347 msgid "WooCommerce Fields" … … 348 352 msgstr "" 349 353 354 #: admin/partials/mapping.php:75 355 msgid "Products" 356 msgstr "" 357 358 #: admin/partials/mapping.php:75 359 msgid "Total amount" 360 msgstr "" 361 362 #: admin/partials/mapping.php:75 363 msgid "Date of purchase" 364 msgstr "" 365 350 366 #: doppler-for-woocommerce.php:56 351 367 msgid ""
Note: See TracChangeset
for help on using the changeset viewer.