WordPress.org
Get WordPress

Plugin Directory

Changeset 2469697


Ignore:
Timestamp:
02/05/2021 05:59:57 PM (5 years ago)
Author:
Eoxia
Message:

Version 2.3.3

  • Add - Change on Statut for Proposals, orders and invoices.
  • Add - Change on payment method paypal/stripe -> credit card.
  • Add - Invoice link on single page order.
  • Add - Translate.
  • Fix - First name doesn't appear on Dolibarr tiers.
  • Fix - Invoice module appear on WPshop without Dolibarr.
Location:
wpshop/trunk
Files:
3 added
19 edited

Legend:

Unmodified
Added
Removed

  • wpshop/trunk/core/asset/language/wpshop-fr_FR.po

    r2406792 r2469697  
    22msgstr ""
    33"Project-Id-Version: wpshop\n"
    4 "POT-Creation-Date: 2020-10-23 17:26+0200\n"
    5 "PO-Revision-Date: 2020-10-23 17:26+0200\n"
     4"POT-Creation-Date: 2021-02-04 12:08+0100\n"
     5"PO-Revision-Date: 2021-02-04 12:08+0100\n"
    66"Last-Translator: \n"
    77"Language-Team: Eoxia\n"
    … …  
    131131msgstr "Voir le panier"
    132132
    133 #: modules/checkout/action/class-checkout-action.php:487
     133#: modules/checkout/action/class-checkout-action.php:489
    134134msgid "I accept "
    135135msgstr "J'accepte "
    136136
    137 #: modules/checkout/action/class-checkout-action.php:491
     137#: modules/checkout/action/class-checkout-action.php:493
    138138#, php-format
    139139msgid "the <a target=\"_blank\" href=\"%1$s\">%2$s</a> and "
    140140msgstr "les <a href=\"%1$s\">%2$s</a> et "
    141141
    142 #: modules/checkout/action/class-checkout-action.php:496
     142#: modules/checkout/action/class-checkout-action.php:498
    143143#, php-format
    144144msgid "the <a target=\"_blank\" href=\"%1$s\">%2$s</a>"
    … …  
    278278msgstr "Code postal"
    279279
    280 #: modules/checkout/view/frontend/payment.php:27
     280#: modules/checkout/view/frontend/payment.php:26
    281281#: modules/dashboard/view/metaboxes/metabox-payment.view.php:34
    282282#: modules/dolibarr/doli-invoice/view/metabox-invoice-details.view.php:29
    … …  
    407407#: modules/dolibarr/doli-invoice/view/item.view.php:39
    408408#: modules/dolibarr/doli-invoice/view/item.view.php:61
    409 #: modules/dolibarr/doli-order/view/item.view.php:39
     409#: modules/dolibarr/doli-order/view/item.view.php:40
    410410#: modules/dolibarr/doli-proposals/view/item.view.php:38
    411411#: modules/proposals/view/item.view.php:34
    … …  
    457457#: modules/dashboard/view/metaboxes/metabox-order.view.php:45
    458458#: modules/dashboard/view/metaboxes/metabox-proposal.view.php:45
    459 #: modules/dolibarr/doli-order/view/item.view.php:54
     459#: modules/dolibarr/doli-order/view/item.view.php:55
    460460#: modules/dolibarr/doli-order/view/metabox-order-details.view.php:37
    461461#: modules/dolibarr/doli-order/view/metabox-order-details.view.php:38
    … …  
    549549
    550550#: modules/dolibarr/doli-associate/view/compare-wps-product.view.php:36
    551 #: modules/products/view/metabox/main.view.php:25
    552551#: modules/settings/view/payment-method-single.view.php:50
    553552msgid "Description"
    … …  
    556555#: modules/dolibarr/doli-associate/view/compare-wps-product.view.php:37
    557556#: modules/products/view/list.view.php:34
    558 #: modules/products/view/metabox/main.view.php:30
     557#: modules/products/view/metabox/main.view.php:47
    559558msgid "Price HT(€)"
    560559msgstr "Prix HT(€)"
    561560
    562561#: modules/dolibarr/doli-associate/view/compare-wps-product.view.php:38
    563 #: modules/products/view/metabox/main.view.php:34
     562#: modules/products/view/metabox/main.view.php:53
    564563msgid "VAT Rate"
    565564msgstr "Taux de TVA"
    … …  
    570569#: modules/dolibarr/doli-proposals/view/list.view.php:33
    571570#: modules/products/view/list.view.php:36
    572 #: modules/products/view/metabox/main.view.php:38
     571#: modules/products/view/metabox/main.view.php:75
    573572#: modules/proposals/view/list.view.php:25
    574573msgid "Price TTC(€)"
    … …  
    653652
    654653#: modules/dolibarr/doli-categories/action/class-doli-categories-action.php:58
     654#: modules/dolibarr/doli-categories/view/main.view.php:25
     655msgid "Categories WPshop"
     656msgstr ""
     657
    655658#: modules/dolibarr/doli-categories/action/class-doli-categories-action.php:161
    656 #: modules/dolibarr/doli-categories/view/main.view.php:25
    657659#: modules/dolibarr/doli-sync/class/class-doli-sync.php:84
    658660#: modules/products/view/list.view.php:33
    … …  
    660662msgstr ""
    661663
    662 #: modules/dolibarr/doli-categories/class/class-doli-categories.php:218
    663 #: modules/dolibarr/doli-products/class/class-doli-products.php:85
     664#: modules/dolibarr/doli-categories/class/class-doli-categories.php:224
     665#: modules/dolibarr/doli-products/class/class-doli-products.php:87
    664666#: modules/dolibarr/doli-sync/class/class-doli-sync.php:188
    665667#, php-format
    … …  
    679681#: modules/dolibarr/doli-invoice/view/item.view.php:37
    680682#: modules/dolibarr/doli-invoice/view/item.view.php:60
    681 #: modules/dolibarr/doli-order/view/item.view.php:37
     683#: modules/dolibarr/doli-order/view/item.view.php:38
    682684#: modules/dolibarr/doli-proposals/view/item.view.php:36
    683685#: modules/proposals/view/item.view.php:32
    … …  
    722724msgstr "Facture détails %s"
    723725
    724 #: modules/dolibarr/doli-invoice/action/class-doli-invoice-action.php:108
     726#: modules/dolibarr/doli-invoice/action/class-doli-invoice-action.php:109
    725727#: modules/dolibarr/doli-invoice/filter/class-doli-invoice-filter.php:70
    726728#: modules/dolibarr/doli-invoice/filter/class-doli-invoice-filter.php:72
    … …  
    730732msgstr "Factures"
    731733
    732 #: modules/dolibarr/doli-invoice/action/class-doli-invoice-action.php:357
     734#: modules/dolibarr/doli-invoice/action/class-doli-invoice-action.php:359
    733735msgid "Invoice not found"
    734736msgstr "Facture non trouvée"
    … …  
    887889#: modules/dolibarr/doli-order/action/class-doli-order-action.php:87
    888890#: modules/dolibarr/doli-statut/class/class-doli-statut.php:64
    889 #: modules/dolibarr/doli-statut/class/class-doli-statut.php:86
     891#: modules/dolibarr/doli-statut/class/class-doli-statut.php:90
    890892msgid "Delivered"
    891 msgstr "Délivrée"
     893msgstr "Livrée"
    892894
    893895#: modules/dolibarr/doli-order/action/class-doli-order-action.php:97
    894896#: modules/dolibarr/doli-statut/class/class-doli-statut.php:78
    895 #: modules/dolibarr/doli-statut/class/class-doli-statut.php:108
     897#: modules/dolibarr/doli-statut/class/class-doli-statut.php:112
    896898msgid "Canceled"
    897899msgstr "Anulée"
    … …  
    950952
    951953#: modules/dolibarr/doli-order/filter/class-doli-order-filter.php:123
    952 msgid "(Delivery)"
    953 msgstr "Délivrée"
     954#: modules/dolibarr/doli-order/view/metabox-order-payment.view.php:64
     955#: modules/dolibarr/doli-statut/class/class-doli-statut.php:60
     956msgid "Billed"
     957msgstr "Facturée"
    954958
    955959#: modules/dolibarr/doli-order/view/list.view.php:30
    … …  
    10171021msgstr "Déjà réglé"
    10181022
    1019 #: modules/dolibarr/doli-order/view/metabox-order-payment.view.php:64
    1020 #: modules/dolibarr/doli-statut/class/class-doli-statut.php:60
    1021 #: modules/dolibarr/doli-statut/class/class-doli-statut.php:82
    1022 #: modules/dolibarr/doli-statut/class/class-doli-statut.php:100
    1023 msgid "Billed"
    1024 msgstr "Facturé"
    1025 
    10261023#: modules/dolibarr/doli-order/view/metabox-order-payment.view.php:68
    10271024msgid "Remaining unpaid"
    … …  
    10631060msgstr "Propositions commerciales"
    10641061
     1062#: modules/dolibarr/doli-proposals/filter/class-doli-proposals-filter.php:46
     1063msgid " (open proposal)"
     1064msgstr " (proposition ouverte)"
     1065
     1066#: modules/dolibarr/doli-proposals/filter/class-doli-proposals-filter.php:49
     1067msgid " (to be invoiced)"
     1068msgstr " (à facturée)"
     1069
     1070#: modules/dolibarr/doli-proposals/filter/class-doli-proposals-filter.php:52
     1071msgid " (closed)"
     1072msgstr " (fermée)"
     1073
    10651074#: modules/dolibarr/doli-proposals/view/list.view.php:29
    10661075#: modules/proposals/view/list.view.php:21
    … …  
    10701079#: modules/dolibarr/doli-statut/class/class-doli-statut.php:44
    10711080#: modules/dolibarr/doli-statut/class/class-doli-statut.php:70
    1072 #: modules/dolibarr/doli-statut/class/class-doli-statut.php:92
     1081#: modules/dolibarr/doli-statut/class/class-doli-statut.php:96
    10731082msgid "Draft"
    10741083msgstr "Brouillon"
    10751084
    10761085#: modules/dolibarr/doli-statut/class/class-doli-statut.php:48
    1077 msgid "Waiting for a signature"
    1078 msgstr "En attente de la signature"
     1086#: modules/dolibarr/doli-statut/class/class-doli-statut.php:74
     1087msgid "Validated"
     1088msgstr "Validée"
    10791089
    10801090#: modules/dolibarr/doli-statut/class/class-doli-statut.php:52
    10811091msgid "Signed"
    1082 msgstr "Signé"
     1092msgstr "Signée"
    10831093
    10841094#: modules/dolibarr/doli-statut/class/class-doli-statut.php:56
    10851095msgid "Not signed"
    1086 msgstr "Non signé"
    1087 
    1088 #: modules/dolibarr/doli-statut/class/class-doli-statut.php:74
    1089 #: modules/dolibarr/doli-statut/class/class-doli-statut.php:96
    1090 msgid "Not paid"
    1091 msgstr "Non payée"
     1096msgstr "Non signée"
     1097
     1098#: modules/dolibarr/doli-statut/class/class-doli-statut.php:82
     1099msgid "Processed"
     1100msgstr "Traitée"
     1101
     1102#: modules/dolibarr/doli-statut/class/class-doli-statut.php:86
     1103msgid "In progress"
     1104msgstr "En cours"
     1105
     1106#: modules/dolibarr/doli-statut/class/class-doli-statut.php:100
     1107msgid "Unpaid"
     1108msgstr "Impayée"
    10921109
    10931110#: modules/dolibarr/doli-statut/class/class-doli-statut.php:104
     1111#: modules/payment/class/class-payment.php:94
     1112#: modules/payment/class/class-payment.php:98
     1113#: modules/payment/class/class-payment.php:102
     1114#: modules/payment/class/class-payment.php:106
     1115msgid "Paid"
     1116msgstr "Payée"
     1117
     1118#: modules/dolibarr/doli-statut/class/class-doli-statut.php:108
    10941119msgid "Abandoned"
    10951120msgstr "Abondonée"
    … …  
    11201145"<strong>dolibarr</strong>"
    11211146
    1122 #: modules/dolibarr/doli-sync/class/class-doli-sync.php:335
    1123 #: modules/dolibarr/doli-sync/class/class-doli-sync.php:345
     1147#: modules/dolibarr/doli-sync/class/class-doli-sync.php:360
     1148#: modules/dolibarr/doli-sync/class/class-doli-sync.php:370
    11241149msgid "WP Object is not equal Dolibarr Object"
    11251150msgstr "L'objet WordPress n'est pas égal à l'objet Dolibarr"
    11261151
    1127 #: modules/dolibarr/doli-sync/class/class-doli-sync.php:359
     1152#: modules/dolibarr/doli-sync/class/class-doli-sync.php:384
    11281153msgid "Sync OK"
    11291154msgstr "Synchronisation OK"
    11301155
    1131 #: modules/dolibarr/doli-sync/class/class-doli-sync.php:382
     1156#: modules/dolibarr/doli-sync/class/class-doli-sync.php:407
    11321157msgid "Looking for sync status"
    11331158msgstr "Rechercher un statut de synchronisation"
    11341159
    1135 #: modules/dolibarr/doli-sync/class/class-doli-sync.php:393
     1160#: modules/dolibarr/doli-sync/class/class-doli-sync.php:418
    11361161msgid "No associated to an ERP Entity"
    11371162msgstr "Cette entitée n'est pas associé à votre ERP"
    11381163
    1139 #: modules/dolibarr/doli-sync/class/class-doli-sync.php:424
     1164#: modules/dolibarr/doli-sync/class/class-doli-sync.php:449
    11401165msgid "Error not defined"
    11411166msgstr "Erreur non définie"
    … …  
    11451170msgstr "Synchroniser"
    11461171
    1147 #: modules/dolibarr/doli-sync/view/sync-item.view.php:37
     1172#: modules/dolibarr/doli-sync/view/sync-item.view.php:38
    11481173#, php-format
    11491174msgid "Associate and synchronize %s"
    11501175msgstr "Associer et synchroniser %s"
    11511176
    1152 #: modules/dolibarr/doli-third-parties/class/class-doli-third-parties.php:138
     1177#: modules/dolibarr/doli-third-parties/class/class-doli-third-parties.php:141
    11531178#, php-format
    11541179msgid ""
    … …  
    14061431
    14071432#: modules/payment/class/class-payment.php:76
     1433#: modules/payment/class/class-payment.php:85
    14081434msgid "Use your credit card to place your order"
    14091435msgstr "Utilisez votre carte de crédit pour passer votre commande"
    14101436
    1411 #: modules/payment/class/class-payment.php:87
     1437#: modules/payment/class/class-payment.php:84
     1438msgid "Carte Bancaire"
     1439msgstr ""
     1440
     1441#: modules/payment/class/class-payment.php:93
    14121442msgid "Waiting for the check"
    14131443msgstr "En attente du chèque"
    14141444
    1415 #: modules/payment/class/class-payment.php:88
    1416 #: modules/payment/class/class-payment.php:92
    1417 #: modules/payment/class/class-payment.php:96
    1418 #: modules/payment/class/class-payment.php:100
    1419 msgid "Paid"
    1420 msgstr "Payée"
    1421 
    1422 #: modules/payment/class/class-payment.php:91
    1423 #: modules/payment/class/class-payment.php:95
    1424 #: modules/payment/class/class-payment.php:99
     1445#: modules/payment/class/class-payment.php:97
     1446#: modules/payment/class/class-payment.php:101
     1447#: modules/payment/class/class-payment.php:105
    14251448msgid "Waiting for the payment"
    14261449msgstr "En attente du paiement"
    … …  
    14571480
    14581481#: modules/products/class/class-product.php:202
    1459 #, fuzzy
    1460 #| msgid "Product configuration"
    14611482msgid "Dolibarr Product configuration"
    1462 msgstr "Configuration du produit"
     1483msgstr "Configuration du produit Dolibarr"
    14631484
    14641485#: modules/products/class/class-product.php:209
    1465 #, fuzzy
    1466 #| msgid "Product configuration"
    14671486msgid "WordPress Product configuration"
    1468 msgstr "Configuration du produit"
     1487msgstr "Configuration du produit WordPress"
    14691488
    14701489#: modules/products/class/class-product.php:216
    … …  
    15671586
    15681587#: modules/products/view/frontend/wps-product-grid.php:50
    1569 #, fuzzy
    1570 #| msgid "Add New Product category"
    15711588msgid "Add the product to cart"
    1572 msgstr "Ajouter une nouvelle catégorie de produits"
     1589msgstr "Ajouter le produit au panier"
    15731590
    15741591#: modules/products/view/frontend/wps-product-list-edit.php:50
    … …  
    16521669msgstr "Ajouter une image à la galerie"
    16531670
    1654 #: modules/products/view/metabox/main.view.php:46
    1655 msgid "Connect WPshop to your ERP to edit product datas"
    1656 msgstr ""
     1671#: modules/products/view/metabox/main.view.php:86
     1672msgid "To modify the data of this product, go to Dolibarr"
     1673msgstr "Pour modifier les données de ce produit, aller sur Dolibarr"
    16571674
    16581675#: modules/proposals/action/class-proposals-action.php:78
    … …  
    17351752msgstr "Titre:"
    17361753
    1737 #: modules/settings/action/class-settings-action.php:150
    1738 #: modules/settings/action/class-settings-action.php:313
     1754#: modules/settings/action/class-settings-action.php:152
     1755#: modules/settings/action/class-settings-action.php:315
    17391756msgid "WPshop cannot connect to dolibarr. Please check your settings"
    17401757msgstr ""
    17411758"WPshop n'est pas connecté à Dolibarr. Veuillez vérifier vos configurations"
    17421759
    1743 #: modules/settings/action/class-settings-action.php:157
    1744 #: modules/settings/action/class-settings-action.php:194
    1745 #: modules/settings/action/class-settings-action.php:227
    1746 #: modules/settings/action/class-settings-action.php:256
    1747 #: modules/settings/action/class-settings-action.php:320
     1760#: modules/settings/action/class-settings-action.php:159
     1761#: modules/settings/action/class-settings-action.php:196
     1762#: modules/settings/action/class-settings-action.php:229
     1763#: modules/settings/action/class-settings-action.php:258
     1764#: modules/settings/action/class-settings-action.php:322
    17481765msgid "Your settings have been saved."
    17491766msgstr "Vos réglages ont été enregistrés."
    17501767
    1751 #: modules/settings/class/class-settings.php:141
     1768#: modules/settings/class/class-settings.php:145
    17521769msgid "No page"
    17531770msgstr "Pas de page"
    17541771
    1755 #: modules/settings/class/class-settings.php:229
     1772#: modules/settings/class/class-settings.php:233
    17561773msgid "No product"
    17571774msgstr "Aucun produit"
    … …  
    18521869
    18531870#: modules/settings/view/erp.view.php:187
    1854 #: modules/settings/view/general.view.php:68
     1871#: modules/settings/view/general.view.php:75
    18551872#: modules/settings/view/pages.view.php:66
    18561873#: modules/settings/view/payment-method-single.view.php:58
    … …  
    18781895msgid "Split product"
    18791896msgstr "Séparer les lignes des produits dans le panier"
     1897
     1898#: modules/settings/view/general.view.php:70
     1899msgid "Debug mode"
     1900msgstr ""
    18801901
    18811902#: modules/settings/view/main.view.php:40 modules/tools/view/main.view.php:29
    … …  
    20662087msgid "Tools"
    20672088msgstr "Outils"
     2089
     2090#~ msgid "Waiting for a signature"
     2091#~ msgstr "En attente de la signature"
     2092
     2093#~ msgid "(Delivery)"
     2094#~ msgstr "Délivrée"
     2095
     2096#~ msgid "Not paid"
     2097#~ msgstr "Non payée"
    20682098
    20692099#~ msgid "Products Category"
    … …  
    22812311#~ msgstr "Filtrer"
    22822312
    2283 #~ msgid "Valid page"
    2284 #~ msgstr "Validation"
    2285 
    22862313#~ msgid "Proposal details %s"
    22872314#~ msgstr "Details de la proposition commerciale %s"

  • wpshop/trunk/modules/checkout/action/class-checkout-action.php

    r2389730 r2469697  
    250250            if ( ! is_user_logged_in() ) {
    251251                $third_party = Third_Party::g()->update( $posted_data['third_party'] );
    252                 // Call wpshop to update attached ERP.
    253                 do_action( 'wps_checkout_create_third_party', $third_party );
    254252
    255253                $posted_data['contact']['login']          = sanitize_user( current( explode( '@', $posted_data['contact']['email'] ) ), true );
    … …  
    262260                $third_party->data['contact_ids'][] = $contact->data['id'];
    263261                $third_party                        = Third_Party::g()->update( $third_party->data );
     262
     263                // Call wpshop to update attached ERP.
     264                do_action( 'wps_checkout_create_third_party', $third_party );
    264265
    265266                // Call wpshop to update attached ERP.
    … …  
    417418     */
    418419    public function callback_checkout_doli_proposal( $third_party, $contact ) {
     420
    419421        $type_payment = ! empty( $_POST['type_payment'] ) ? sanitize_text_field( $_POST['type_payment'] ) : '';
    420422

  • wpshop/trunk/modules/dolibarr/doli-invoice/action/class-doli-invoice-action.php

    r2406792 r2469697  
    106106     */
    107107    public function callback_admin_menu() {
    108         add_submenu_page( 'wpshop', __( 'Invoices', 'wpshop' ), __( 'Invoices', 'wpshop' ), 'manage_options', 'wps-invoice', array( $this, 'callback_add_menu_page' ) );
     108        if ( Settings::g()->dolibarr_is_active() ) {
     109            add_submenu_page('wpshop', __('Invoices', 'wpshop'), __('Invoices', 'wpshop'), 'manage_options', 'wps-invoice', array($this, 'callback_add_menu_page'));
     110        }
    109111    }
    110112

  • wpshop/trunk/modules/dolibarr/doli-order/action/class-doli-order-action.php

    r2406792 r2469697  
    258258     *
    259259     * @since   2.0.0
    260      * @version 2.0.0
     260     * @version 2.3.3
    261261     *
    262262     * @param Doli_Order $order Les données d'une commande.
    263263     */
    264264    public function metabox_order_payment( $order ) {
     265        $dolibarr_option = get_option( 'wps_dolibarr', Settings::g()->default_settings );
     266
    265267        $doli_invoices = array();
    266268        $wp_invoices   = array();
    … …  
    270272            $route = 'invoices?sortfield=t.rowid&sortorder=ASC&limit=100&sqlfilters=';
    271273            foreach ( $order->data['linked_objects_ids']['facture'] as $doli_invoice_id ) {
    272                 $route .= '(t.rowid:=:' . $doli_invoice_id . ') or';
     274                $route .= 't.rowid=' . $doli_invoice_id . ' or ';
    273275            }
    274276
    … …  
    301303            'total_ttc_invoices' => $total_ttc_invoices,
    302304            'remaining_unpaid'   => $remaining_unpaid,
     305            'doli_url'           => $dolibarr_option['dolibarr_url'],
    303306        ) );
    304307    }
    … …  
    415418        $wp_order = Doli_Order::g()->get( array( 'schema' => true ), true );
    416419        $wp_order = Doli_Order::g()->doli_to_wp( $doli_order, $wp_order, true );
    417 
    418420        return $wp_order;
    419421    }

  • wpshop/trunk/modules/dolibarr/doli-order/class/class-doli-order.php

    r2389544 r2469697  
    264264                    break;
    265265                case 2:
     266                    $status = 'wps-shipmentprocess';
    266267                    break;
    267268                case 3:
    268269                    $status                      = 'wps-delivered';
    269270                    $wp_order->data['delivered'] = 1;
     271                    if ( $wp_order->data['billed'] ) {
     272                        $status = 'wps-billed';
     273                    }
    270274                    break;
    271275                default:
    … …  
    274278            }
    275279
    276             if ( $wp_order->data['billed'] ) {
    277                 $status = 'wps-billed';
    278 
     280            if ( $wp_order->data['billed'] && $status = 'wps-billed' ) {
    279281                if ( ! $only_convert ) {
    280282                    Product_Downloadable::g()->create_from_order( $wp_order );

  • wpshop/trunk/modules/dolibarr/doli-order/filter/class-doli-order-filter.php

    r2389544 r2469697  
    77 * @copyright (c) 2011-2020 Eoxia <[email protected]>.
    88 * @since     2.0.0
    9  * @version   2.0.0
     9 * @version   2.3.3
    1010 */
    1111
    … …  
    107107     *
    108108     * @since   2.0.0
    109      * @version 2.0.0
     109     * @version 2.3.3
    110110     *
    111111     * @param  string       $status Le statut d'une facture.
    … …  
    120120            }
    121121
    122             if ( $object->data['delivered'] ) {
    123                 return $status . ' ' . __( '(Delivery)', 'wpshop' );
     122            if ( $object->data['billed'] ) {
     123                return $status . ' - ' . __( 'Billed', 'wpshop' );
    124124            }
    125125        }

  • wpshop/trunk/modules/dolibarr/doli-order/view/metabox-order-payment.view.php

    r2406792 r2469697  
    77 * @copyright (c) 2011-2020 Eoxia <[email protected]>.
    88 * @since     2.0.0
    9  * @version   2.0.0
     9 * @version   2.3.3
    1010 */
    1111
    … …  
    7171        </tfoot>
    7272    </table>
     73
     74    <?php if ( ! empty( $invoices ) ) :
     75        foreach ( $invoices as $invoice ) : ?>
     76            <ul class="reference-title">
     77                <?php if ( ! empty( $invoice->data['external_id'] ) ) : ?>
     78                    <li><a href="<?php echo esc_attr( $doli_url ); ?>/compta/facture/card.php?facid=<?php echo $invoice->data['external_id']; ?>" target="_blank"><?php echo esc_html( $invoice->data['title'] ); ?></a></li>
     79                <?php endif; ?>
     80            </ul>
     81        <?php endforeach;
     82    endif; ?>
    7383</div>

  • wpshop/trunk/modules/dolibarr/doli-payment/class/class-doli-payment.php

    r2389544 r2469697  
    155155
    156156        if ( 'CB' === $payment_method ) {
    157             return 'paypal';
    158         } elseif ( 'STR' === $payment_method ) {
    159             return 'stripe';
     157            return 'carte_bancaire';
    160158        } elseif ( 'CHQ' === $payment_method ) {
    161159            return 'cheque';

  • wpshop/trunk/modules/dolibarr/doli-proposals/class/class-doli-proposals.php

    r2389544 r2469697  
    77 * @copyright (c) 2011-2020 Eoxia <[email protected]>.
    88 * @since     2.0.0
    9  * @version   2.0.0
     9 * @version   2.3.3
    1010 */
    1111
    … …  
    5454     *
    5555     * @since   2.0.0
    56      * @version 2.0.0
     56     * @version 2.3.3
    5757     *
    5858     * @param  stdClass $doli_proposal Les données d'une proposition commerciale Dolibarr.
    … …  
    117117                    break;
    118118                case 4:
    119                     $status                      = 'publish';
     119                    $status                      = 'wps-billed';
    120120                    $wp_proposal->data['billed'] = 1;
    121121                    break;

  • wpshop/trunk/modules/dolibarr/doli-proposals/doli-proposals.config.json

    r2389544 r2469697  
    33    "slug": "doli-proposals",
    44    "since": "2.0.0",
    5     "version": "2.0.0",
     5    "version": "2.3.3",
    66    "description": "Le module gérant les propositions commerciales",
    77    "path": "modules/dolibarr/doli-proposals/",
    88    "dependencies": {
    9      "class": {},
    10      "action": {}
     9      "filter": {},
     10      "class": {},
     11      "action": {}
    1112    }
    1213}

  • wpshop/trunk/modules/dolibarr/doli-statut/class/class-doli-statut.php

    r2389544 r2469697  
    77 * @copyright (c) 2011-2020 Eoxia <[email protected]>.
    88 * @since     2.0.0
    9  * @version   2.0.0
     9 * @version   2.3.3
    1010 */
    1111
    … …  
    3636     *
    3737     * @since   2.0.0
    38      * @version 2.0.0
     38     * @version 2.3.3
    3939     */
    4040    protected function construct() {
    … …  
    4646                ),
    4747                'publish'       => array(
    48                     'text'  => __( 'Waiting for a signature', 'wpshop' ),
     48                    'text'  => __( 'Validated', 'wpshop' ),
    4949                    'class' => 'status-orange',
    5050                ),
    5151                'wps-accepted'  => array(
    5252                    'text'  => __( 'Signed', 'wpshop' ),
    53                     'class' => 'status-orange',
     53                    'class' => 'status-green',
    5454                ),
    5555                'wps-refused'   => array(
    5656                    'text'  => __( 'Not signed', 'wpshop' ),
    57                     'class' => 'status-red',
     57                    'class' => 'status-grey',
    5858                ),
    5959                'wps-billed'    => array(
    6060                    'text'  => __( 'Billed', 'wpshop' ),
    61                     'class' => 'status-green',
     61                    'class' => 'status-grey',
    6262                ),
    6363                'wps-delivered' => array(
    … …  
    7272                ),
    7373                'publish'       => array(
    74                     'text'  => __( 'Not paid', 'wpshop' ),
     74                    'text'  => __( 'Validated', 'wpshop' ),
    7575                    'class' => 'status-orange',
    7676                ),
    … …  
    8080                ),
    8181                'wps-billed'    => array(
    82                     'text'  => __( 'Billed', 'wpshop' ),
     82                    'text'  => __( 'Processed', 'wpshop' ),
     83                    'class' => 'status-grey',
     84                ),
     85                'wps-shipmentprocess'    => array(
     86                    'text'  => __( 'In progress', 'wpshop' ),
    8387                    'class' => 'status-green',
    8488                ),
    … …  
    9498                ),
    9599                'publish'       => array(
    96                     'text'  => __( 'Not paid', 'wpshop' ),
     100                    'text'  => __( 'Unpaid', 'wpshop' ),
    97101                    'class' => 'status-orange',
    98102                ),
    99103                'wps-billed'    => array(
    100                     'text'  => __( 'Billed', 'wpshop' ),
    101                     'class' => 'status-green',
     104                    'text'  => __( 'Paid', 'wpshop' ),
     105                    'class' => 'status-grey',
    102106                ),
    103107                'wps-abandoned' => array(

  • wpshop/trunk/modules/dolibarr/doli-third-parties/class/class-doli-third-parties.php

    r2406792 r2469697  
    115115        'messages' => array(),
    116116    ) ) {
     117        $contact = User::g()->get( array( 'id' => $wp_third_party->data['contact_ids'][0] ), true );
     118
    117119        $data = array(
    118120            'name'          => $wp_third_party->data['title'],
    … …  
    128130            'code_client'   => 'auto',
    129131            'array_options' => array(
    130                 'options__wps_id' => $wp_third_party->data['id'],
     132                'options_firstname' => $contact->data['firstname'],
     133                'options__wps_id'   => $wp_third_party->data['id'],
    131134            ),
    132135        );

  • wpshop/trunk/modules/payment/class/class-payment.php

    r2389544 r2469697  
    77 * @copyright (c) 2011-2020 Eoxia <[email protected]>.
    88 * @since     2.0.0
    9  * @version   2.0.0
     9 * @version   2.3.3
    1010 */
    1111
    … …  
    4545     *
    4646     * @since   2.0.0
    47      * @version 2.0.0
     47     * @version 2.3.3
    4848     */
    4949    protected function construct() {
    … …  
    7878                'secret_key'         => '',
    7979                'use_stripe_sandbox' => false,
     80            ),
     81            'carte_bancaire'  => array(
     82                'active'             => true,
     83                'logo'               => '<i class="fas fa-credit-card"></i>',
     84                'title'              => __( 'Carte Bancaire', 'wpshop' ),
     85                'description'        => __( 'Use your credit card to place your order', 'wpshop' ),
    8086            ),
    8187        );

  • wpshop/trunk/modules/products/view/metabox/main.view.php

    r2406792 r2469697  
    77 * @copyright (c) 2011-2020 Eoxia <[email protected]>.
    88 * @since     2.0.0
    9  * @version   2.0.0
     9 * @version   2.3.3
    1010 */
    1111
    … …  
    2222
    2323<div class="wpeo-wrap">
    24     <?php if ( Settings::g()->dolibarr_is_active() ) : ?>
    25         <div class="wps-metabox-subtitle"><?php esc_html_e( 'Description', 'wpshop' ); ?></div>
    26         <div class="wps-product-description"><p><?php echo $product->data['content']; ?></p></div>
     24    <?php if ( ! Settings::g()->dolibarr_is_active() ) : ?>
     25        <!--        <div class="wps-metabox-subtitle">--><?php //esc_html_e( 'Description', 'wpshop' ); ?><!--</div>-->
     26        <!--        <div class="wps-product-description"><p>--><?php //echo $product->data['content']; ?><!--</p></div>-->
     27        <!---->
     28        <!--        <div class="wpeo-gridlayout grid-3">-->
     29        <!--            <div>-->
     30        <!--                <div class="wps-metabox-subtitle">--><?php //esc_html_e( 'Price HT(€)', 'wpshop' ); ?><!--</div>-->
     31        <!--                <div class="wps-metabox-content">--><?php //echo $product->data['price'] != 0 ? esc_html( $product->data['price'] ) : ''; ?><!--</div>-->
     32        <!--            </div>-->
     33        <!--            <div>-->
     34        <!--                <div class="wps-metabox-subtitle">--><?php //esc_html_e( 'VAT Rate', 'wpshop' ); ?><!--</div>-->
     35        <!--                <div class="wps-metabox-content">--><?php //echo esc_html( $product->data['tva_tx'] ); ?><!--%</div>-->
     36        <!--            </div>-->
     37        <!--            <div>-->
     38        <!--                <div class="wps-metabox-subtitle">--><?php //esc_html_e( 'Price TTC(€)', 'wpshop' ); ?><!--</div>-->
     39        <!--                <div class="wps-metabox-content">--><?php //echo esc_html( $product->data['price_ttc'] ); ?><!--</div>-->
     40        <!--            </div>-->
     41        <!--        </div>-->
    2742
    28         <div class="wpeo-gridlayout grid-3">
    29             <div>
    30                 <div class="wps-metabox-subtitle"><?php esc_html_e( 'Price HT(€)', 'wpshop' ); ?></div>
    31                 <div class="wps-metabox-content"><?php echo $product->data['price'] != 0 ? esc_html( $product->data['price'] ) : ''; ?></div>
    32             </div>
    33             <div>
    34                 <div class="wps-metabox-subtitle"><?php esc_html_e( 'VAT Rate', 'wpshop' ); ?></div>
    35                 <div class="wps-metabox-content"><?php echo esc_html( $product->data['tva_tx'] ); ?>%</div>
    36             </div>
    37             <div>
    38                 <div class="wps-metabox-subtitle"><?php esc_html_e( 'Price TTC(€)', 'wpshop' ); ?></div>
    39                 <div class="wps-metabox-content"><?php echo esc_html( $product->data['price_ttc'] ); ?></div>
     43        <div class="wpeo-form">
     44            <?php wp_nonce_field( basename( __FILE__ ), 'wpshop_data_fields' ); ?>
     45            <div class="wpeo-gridlayout grid-3">
     46                <div class="form-element">
     47                    <span class="form-label"><?php esc_html_e( 'Price HT(€)', 'wpshop' ); ?></span>
     48                    <label class="form-field-container">
     49                        <input type="text" <?php echo Settings::g()->dolibarr_is_active() ? 'readonly': 'class="form-field"'; ?>  name="product_data[price]" placeholder="0" value="<?php echo esc_attr( $product->data['price'] ) != 0 ? esc_attr( $product->data['price'] ) : ''; ?>" />
     50                    </label>
     51                </div>
     52                <div class="form-element">
     53                    <span class="form-label"><?php esc_html_e( 'VAT Rate', 'wpshop' ); ?></span>
     54                    <label class="form-field-container">
     55                        <?php if ( Settings::g()->dolibarr_is_active() ) : ?>
     56                            <input type="text" readonly value="<?php echo $product->data['tva_tx']; ?>%" />
     57                        <?php else: ?>
     58                            <select name="product_data[tva_tx]" class="form-field">
     59                                <?php $has_selected = false;
     60                                if ( ! empty( Settings::g()->tva ) ) :
     61                                    foreach ( Settings::g()->tva as $tva ) :
     62                                        $selected = '';
     63                                        if ( (float) $tva === (float) $product->data['tva_tx'] || ( ! $has_selected && 20 === $tva ) ) :
     64                                            $selected     = 'selected="selected"';
     65                                            $has_selected = true;
     66                                        endif; ?>
     67                                        <option <?php echo esc_attr( $selected ); ?> value="<?php echo esc_attr( $tva ); ?>"><?php echo esc_html( $tva ); ?>%</option>
     68                                    <?php endforeach;
     69                                endif; ?>
     70                            </select>
     71                        <?php endif; ?>
     72                    </label>
     73                </div>
     74                <div class="form-element">
     75                    <span class="form-label"><?php esc_html_e( 'Price TTC(€)', 'wpshop' ); ?></span>
     76                    <label class="form-field-container">
     77                        <input type="text" readonly value="<?php echo $product->data['price_ttc']; ?>€" />
     78                    </label>
     79                </div>
    4080            </div>
    4181        </div>
    … …  
    4484            <div class="notice-content">
    4585                <div class="notice-subtitle">
    46                     <a href="<?php echo esc_url( admin_url('admin.php?page=wps-settings') ); ?>"><?php esc_html_e( 'Connect WPshop to your ERP to edit product datas', 'wpshop' ); ?></a>
     86                    <a href="<?php echo esc_url( admin_url('admin.php?page=wps-settings') ); ?>"><?php esc_html_e( 'To modify the data of this product, go to Dolibarr', 'wpshop' ); ?></a>
    4787                </div>
    4888            </div>

  • wpshop/trunk/modules/stripe/class/class-stripe.php

    r2423652 r2469697  
    5151        );
    5252
    53         $session = \Stripe\Checkout\Session::create( array(
     53        $session = Stripe\Checkout\Session::create( array(
    5454            'success_url'          => Pages::g()->get_checkout_link() . '/received/order/' . $order->data['external_id'],
    5555            'cancel_url'           => site_url(),

  • wpshop/trunk/readme.txt

    r2423594 r2469697  
    44Donate link: https://www.wpshop.fr/
    55Requires at least: 4.4
    6 Tested up to: 5.5.3
     6Tested up to: 5.6.1
    77Requires PHP: 7.0
    8 Stable tag: 2.3.2
     8Stable tag: 2.3.3
    99License: GPLv3 or later
    1010License URI: https://spdx.org/licenses/GPL-3.0-or-later.html
    … …  
    6666== Changelog ==
    6767
     68= Version 2.3.3 =
     69
     70* Add - Change on Statut for Proposals, orders and invoices.
     71* Add - Change on payment method paypal/stripe -> credit card.
     72* Add - Invoice link on single page order.
     73* Add - Translate.
     74* Add - Edit Dolibarr product configuration on single page.
     75
     76* Fix - First name doesn't appear on Dolibarr tiers.
     77* Fix - Invoice module appear on WPshop without Dolibarr.
     78
    6879= Version 2.3.2 =
    6980

  • wpshop/trunk/wpshop.config.json

    r2423594 r2469697  
    33    "slug": "wpshop",
    44    "since": "2.0.0",
    5     "version": "2.3.2",
     5    "version": "2.3.3",
    66    "description": "L'application WPshop 2",
    77    "externals": [],

  • wpshop/trunk/wpshop.php

    r2423594 r2469697  
    44 * Plugin URI:  https://wpshop.fr/
    55 * Description: Simple, fast, efficient it will transform your WordPress into an internet sales site
    6  * Version:     2.3.2
     6 * Version:     2.3.3
    77 * Author:      Eoxia <[email protected]>
    88 * Author URI:  http://www.eoxia.com/
    … …  
    3838add_filter('site_transient_update_plugins',
    3939    function ($value) {
    40         if ( $value->checked[plugin_basename(__FILE__)] <= "1.6.4" ) {
    41             unset( $value->response[plugin_basename(__FILE__)] );
     40        if (!empty($value->checked)) {
     41            if ( $value->checked[plugin_basename(__FILE__)] <= "1.6.4" ) {
     42                unset( $value->response[plugin_basename(__FILE__)] );
     43            }
    4244        }
    4345            return $value;
Note: See TracChangeset for help on using the changeset viewer.