diff --git a/README.md b/README.md index 0a78538..0604f6d 100755 --- a/README.md +++ b/README.md @@ -31,8 +31,35 @@ Very usefull and powerfull. [CMSUno](https://github.com/boiteasite/cmsuno) +### Gateway ### + +You can create a Gateway plugin for another payment system and link it with Payment. Connectors are as follow : + +* The name of the plugin must begin with __pay__ (payfoo). +* To Enabled/Disabled the plugin in Payment, it's needed to write in __data/payment.json__ : + +``` data['method']['payfoo'] = 1 +data['method']['payfoo'] = 0 ``` + +* The image button of you payment method should named __payfoo-btn.png__. Recommended size : 76x48. Folder : payfoo/img/. +* You should include a JS script with a function named __payfooCart(cart)__. This function will be called when the buyer clic the image button. This is the gateway. +"cart" is a JSON var : + +``` {"prod":{ + {"n":"screwdriver","p":3.90,"i":"id765","q":5}, + {"n":"saw","p":7.60,"i":"string id","q":3}, + {"n":"hammer","p":12.5,"i":"string id","q":2} +}, +"digital":"index|readme", +"ship":"4", +"name":"Bob Dylan", +"adre":"1250 Edouard street 33234 ERZ", +"mail":"bob@example.com"} ``` + + ### Versions ### +* 1.2 - 15/11/2017 : Change connection with external payment gateway * 1.1.3 - 10/11/2017 : Add Gateway with Bitcoin Paycoin plugin * 1.1.2 - 21/05/2017 : Option to hide the CKEditor Add To Cart Button * 1.1.1 - 15/03/2017 : diff --git a/img/paypal76.png b/img/paypal76.png deleted file mode 100755 index 1fe1879..0000000 Binary files a/img/paypal76.png and /dev/null differ diff --git a/img/payplug76.png b/img/payplug76.png deleted file mode 100755 index 1b42268..0000000 Binary files a/img/payplug76.png and /dev/null differ diff --git a/lang/es_ES.utf8/LC_MESSAGES/payment.mo b/lang/es_ES.utf8/LC_MESSAGES/payment.mo index 936dd06..9bfdccc 100755 Binary files a/lang/es_ES.utf8/LC_MESSAGES/payment.mo and b/lang/es_ES.utf8/LC_MESSAGES/payment.mo differ diff --git a/lang/es_ES.utf8/LC_MESSAGES/payment.po b/lang/es_ES.utf8/LC_MESSAGES/payment.po index 9009c2f..be24be2 100755 --- a/lang/es_ES.utf8/LC_MESSAGES/payment.po +++ b/lang/es_ES.utf8/LC_MESSAGES/payment.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: CmsUno\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-21 13:03+0200\n" -"PO-Revision-Date: 2017-05-21 13:05+0200\n" +"POT-Creation-Date: 2017-11-15 10:20+0100\n" +"PO-Revision-Date: 2017-11-15 10:21+0100\n" "Last-Translator: jacques Malgrange \n" "Language-Team: Jacques Malgrange \n" "Language: es_ES\n" @@ -18,7 +18,7 @@ msgstr "" "X-Generator: Poedit 1.8.12\n" "X-Poedit-SearchPath-0: ../../..\n" -#: ../../../payment.php:22 ../../../payment.php:453 +#: ../../../payment.php:22 ../../../payment.php:446 msgid "Archives" msgstr "Archivos" @@ -34,7 +34,7 @@ msgstr "Configure" msgid "Orders" msgstr "Ordenes" -#: ../../../payment.php:25 ../../../payment.php:478 +#: ../../../payment.php:25 ../../../payment.php:472 #: ../../../paymentOrder.php:47 ../../../paymentPdf.php:61 msgid "Order Details" msgstr "Detalles de pedidos" @@ -88,231 +88,223 @@ msgid "Active payment :" msgstr "Pago activo :" #: ../../../payment.php:35 -msgid "Paypal" -msgstr "Paypal" +msgid "External payment" +msgstr "Pago externo" #: ../../../payment.php:37 -msgid "Paypal Plugin needed. EXT mode must be activated." -msgstr "PayPal Plugin necesario. Modo EXT debe estar activado." +msgid "Payment enabled with another plugin (Paypal...)." +msgstr "Pago habilitado con otro plugin (Paypal ...)." -#: ../../../payment.php:40 -msgid "Payplug" -msgstr "Payplug" - -#: ../../../payment.php:42 -msgid "Payplug Plugin needed. EXT mode must be activated." -msgstr "Payplug Plugin necesario. Modo EXT debe estar activado." - -#: ../../../payment.php:45 ../../../payment.php:505 +#: ../../../payment.php:40 ../../../payment.php:499 #: ../../../paymentOrder.php:74 ../../../paymentPdf.php:56 msgid "Bank Transfer" msgstr "Transferencia" -#: ../../../payment.php:47 +#: ../../../payment.php:42 msgid "Enable the payment by bank transfer" msgstr "Habilitar el pago por transferencia" -#: ../../../payment.php:50 ../../../payment.php:353 ../../../payment.php:504 +#: ../../../payment.php:45 ../../../payment.php:346 ../../../payment.php:498 #: ../../../paymentOrder.php:73 ../../../paymentPdf.php:56 msgid "Cheque" msgstr "Cheque" -#: ../../../payment.php:52 +#: ../../../payment.php:47 msgid "Enable the payment by cheque" msgstr "Habilitar el pago por cheque" -#: ../../../payment.php:55 +#: ../../../payment.php:50 msgid "Payment Address" msgstr "Dirección de Pago" -#: ../../../payment.php:57 +#: ../../../payment.php:52 msgid "Cheque only. What name-address should the payment be sent ?" msgstr "Cheque solamente. ¿Qué nombre-dirección se debe enviar el pago?" -#: ../../../payment.php:60 +#: ../../../payment.php:55 msgid "Account owner" msgstr "Propietario de la cuenta" -#: ../../../payment.php:62 +#: ../../../payment.php:57 msgid "Cheque and Bank transfer. Cheque payable to (name, society...)" msgstr "" "Cheque Transferencia y el Banco. Cheque a nombre de (nombre, sociedad ...)" -#: ../../../payment.php:65 ../../../paymentInc.php:137 -#: ../../../paymentInc.php:139 +#: ../../../payment.php:60 ../../../paymentInc.php:140 +#: ../../../paymentInc.php:142 msgid "IBAN" msgstr "IBAN" -#: ../../../payment.php:67 +#: ../../../payment.php:62 msgid "Bank transfer only. International Bank Account Number" msgstr "Sólo las transferencias. Numero de cuenta de Banco Internacional" -#: ../../../payment.php:70 ../../../paymentInc.php:137 -#: ../../../paymentInc.php:139 +#: ../../../payment.php:65 ../../../paymentInc.php:140 +#: ../../../paymentInc.php:142 msgid "BIC" msgstr "BIC" -#: ../../../payment.php:72 +#: ../../../payment.php:67 msgid "Bank transfer only. Bank Identification Code" msgstr "Sólo las transferencias. Banco Código de identificación" -#: ../../../payment.php:75 +#: ../../../payment.php:70 msgid "Tax and shipping :" msgstr "Impuestos y envío :" -#: ../../../payment.php:76 +#: ../../../payment.php:71 msgid "You can create up to 4 fixed or proportional taxes." msgstr "Puede crear hasta 4 impuestos fijos o proporcionales." -#: ../../../payment.php:76 +#: ../../../payment.php:71 msgid "A proportional tax is written with the sign" msgstr "Un impuesto proporcional se escribe con el signo" -#: ../../../payment.php:79 ../../../payment.php:85 ../../../payment.php:91 -#: ../../../payment.php:97 ../../../payment.php:479 ../../../paymentInc.php:45 +#: ../../../payment.php:74 ../../../payment.php:80 ../../../payment.php:86 +#: ../../../payment.php:92 ../../../payment.php:473 ../../../paymentInc.php:45 #: ../../../paymentOrder.php:48 ../../../paymentPdf.php:58 msgid "Tax" msgstr "Impuestos" -#: ../../../payment.php:81 ../../../payment.php:87 ../../../payment.php:93 -#: ../../../payment.php:99 +#: ../../../payment.php:76 ../../../payment.php:82 ../../../payment.php:88 +#: ../../../payment.php:94 msgid "Enabled by default" msgstr "Habilitado por defecto" -#: ../../../payment.php:82 +#: ../../../payment.php:77 msgid "Example : Fixed (0.55$) => 0.55 ; Proportional (19.6%) => 19.6%" msgstr "Ejemplo : Fijo (0,55 $) => 0,55 ; Proporcional (19.6%) => 19,6%" -#: ../../../payment.php:103 +#: ../../../payment.php:98 msgid "I enter my prices :" msgstr "Entro en mis precios :" -#: ../../../payment.php:106 ../../../payment.php:116 +#: ../../../payment.php:101 ../../../payment.php:111 msgid "Tax included" msgstr "Impuesto incluido" -#: ../../../payment.php:107 ../../../payment.php:117 +#: ../../../payment.php:102 ../../../payment.php:112 msgid "Duty free" msgstr "Libre de impuestos" -#: ../../../payment.php:110 +#: ../../../payment.php:105 msgid "When I set the price of an item, the tax is ..." msgstr "Cuando me puse el precio de un artículo, el impuesto es ..." -#: ../../../payment.php:113 +#: ../../../payment.php:108 msgid "Prices displayed :" msgstr "Los precios que aparecen :" -#: ../../../payment.php:120 +#: ../../../payment.php:115 msgid "On the site, the price of the item is displayed..." msgstr "En el sitio, se muestra el precio del artículo..." -#: ../../../payment.php:123 ../../../payment.php:125 ../../../payment.php:490 +#: ../../../payment.php:118 ../../../payment.php:120 ../../../payment.php:484 #: ../../../paymentGetData.php:8 ../../../paymentInc.php:48 -#: ../../../paymentInc.php:103 ../../../paymentInc.php:104 +#: ../../../paymentInc.php:106 ../../../paymentInc.php:107 #: ../../../paymentOrder.php:59 ../../../paymentPdf.php:93 msgid "Shipping cost" msgstr "Costo de envío" -#: ../../../payment.php:128 +#: ../../../payment.php:123 msgid "Cart :" msgstr "Carrito :" -#: ../../../payment.php:131 +#: ../../../payment.php:126 msgid "No Add To Cart button" msgstr "No hay botón de Añadir al carrito" -#: ../../../payment.php:133 +#: ../../../payment.php:128 msgid "You don't want to use the CKEditor Add To Cart Button." msgstr "No desea utilizar el botón Añadir al carrito de CKEditor." -#: ../../../payment.php:136 +#: ../../../payment.php:131 msgid "Currency" msgstr "Moneda" -#: ../../../payment.php:139 +#: ../../../payment.php:134 msgid "Euro" msgstr "Euro" -#: ../../../payment.php:140 +#: ../../../payment.php:135 msgid "US Dollar" msgstr "Dolar US" -#: ../../../payment.php:141 +#: ../../../payment.php:136 msgid "Canadian Dollar" msgstr "Dolar canadiense" -#: ../../../payment.php:142 +#: ../../../payment.php:137 msgid "Pound Sterling" msgstr "Libra esterlina" -#: ../../../payment.php:143 +#: ../../../payment.php:138 msgid "Swiss Franc" msgstr "Franco suizo" -#: ../../../payment.php:144 +#: ../../../payment.php:139 msgid "Danish Krone" msgstr "Corona danesa" -#: ../../../payment.php:145 +#: ../../../payment.php:140 msgid "Norwegian Krone" msgstr "Corona noruega" -#: ../../../payment.php:146 +#: ../../../payment.php:141 msgid "Swedish Krona" msgstr "Corona sueca" -#: ../../../payment.php:147 +#: ../../../payment.php:142 msgid "Polish Zloty" msgstr "Zloty polaco" -#: ../../../payment.php:148 +#: ../../../payment.php:143 msgid "Russian Ruble" msgstr "Rublo ruso" -#: ../../../payment.php:151 +#: ../../../payment.php:146 msgid "What is the currency of payment." msgstr "¿Cuál es la moneda de pago?" -#: ../../../payment.php:154 +#: ../../../payment.php:149 msgid "Integration" msgstr "Integración" -#: ../../../payment.php:157 +#: ../../../payment.php:152 msgid "Shortcode" msgstr "Shortcode" -#: ../../../payment.php:158 +#: ../../../payment.php:153 msgid "Menu" msgstr "Menú" -#: ../../../payment.php:161 +#: ../../../payment.php:156 msgid "Use the shortcode [[paymentCart]] or use auto integration in the menu." msgstr "" "Utilice el shortcode [[paymentCart]] o utilizar la integración automática en " "el menú." -#: ../../../payment.php:164 +#: ../../../payment.php:159 msgid "Box alignment" msgstr "Alineación Box" -#: ../../../payment.php:167 +#: ../../../payment.php:162 msgid "Left" msgstr "Izquierda" -#: ../../../payment.php:168 +#: ../../../payment.php:163 msgid "Right" msgstr "Derecha" -#: ../../../payment.php:171 +#: ../../../payment.php:166 msgid "Use Right if the cart appears to the right of the window." msgstr "Utilice derecho si el carro aparece a la derecha de la ventana." -#: ../../../payment.php:174 +#: ../../../payment.php:169 msgid "Box color" msgstr "Color de la caja" -#: ../../../payment.php:176 +#: ../../../payment.php:171 msgid "" "Background color for the cart. HTML format (ex : #9f9f9f). Leave blank for " "automatic choice." @@ -320,190 +312,190 @@ msgstr "" "Color de fondo para la cesta. Formato HTML (ejemplo: # 9f9f9f). Dejar en " "blanco para la opción automática." -#: ../../../payment.php:179 +#: ../../../payment.php:174 msgid "Icon color" msgstr "Color del icono" -#: ../../../payment.php:182 +#: ../../../payment.php:177 msgid "Black" msgstr "Negro" -#: ../../../payment.php:183 +#: ../../../payment.php:178 msgid "White" msgstr "Blanco" -#: ../../../payment.php:186 +#: ../../../payment.php:181 msgid "Color of the cart icon and the text." msgstr "El color del icono de la cesta y el texto." -#: ../../../payment.php:189 +#: ../../../payment.php:184 msgid "Save" msgstr "Guardar" -#: ../../../payment.php:229 +#: ../../../payment.php:222 msgid "Backup performed" msgstr "Copia de seguridad realizada" -#: ../../../payment.php:230 +#: ../../../payment.php:223 msgid "Impossible backup" msgstr "Copia de seguridad Imposible" -#: ../../../payment.php:234 +#: ../../../payment.php:227 msgid "List of orders" msgstr "Lista de órdenes" -#: ../../../payment.php:272 ../../../paymentPdf.php:50 +#: ../../../payment.php:265 ../../../paymentPdf.php:50 msgid "Date" msgstr "Fecha" -#: ../../../payment.php:272 +#: ../../../payment.php:265 msgid "Type" msgstr "Tipos" -#: ../../../payment.php:272 ../../../payment.php:479 ../../../payment.php:499 -#: ../../../paymentInc.php:53 ../../../paymentInc.php:124 -#: ../../../paymentInc.php:137 ../../../paymentInc.php:138 -#: ../../../paymentInc.php:139 ../../../paymentOrder.php:48 +#: ../../../payment.php:265 ../../../payment.php:473 ../../../payment.php:493 +#: ../../../paymentInc.php:53 ../../../paymentInc.php:127 +#: ../../../paymentInc.php:140 ../../../paymentInc.php:141 +#: ../../../paymentInc.php:142 ../../../paymentOrder.php:48 #: ../../../paymentOrder.php:68 ../../../paymentPdf.php:58 #: ../../../paymentPdf.php:105 msgid "Name" msgstr "Nombre" -#: ../../../payment.php:272 ../../../payment.php:500 ../../../paymentInc.php:54 -#: ../../../paymentInc.php:124 ../../../paymentInc.php:138 +#: ../../../payment.php:265 ../../../payment.php:494 ../../../paymentInc.php:54 +#: ../../../paymentInc.php:127 ../../../paymentInc.php:141 #: ../../../paymentOrder.php:69 ../../../paymentPdf.php:109 msgid "Address" msgstr "Dirección" -#: ../../../payment.php:272 +#: ../../../payment.php:265 msgid "Article" msgstr "Artículo" -#: ../../../payment.php:272 ../../../payment.php:479 +#: ../../../payment.php:265 ../../../payment.php:473 #: ../../../paymentOrder.php:48 ../../../paymentPdf.php:58 msgid "Price" msgstr "Precio" -#: ../../../payment.php:272 ../../../payment.php:391 ../../../payment.php:392 -#: ../../../payment.php:393 ../../../payment.php:510 ../../../payment.php:513 -#: ../../../payment.php:514 +#: ../../../payment.php:265 ../../../payment.php:384 ../../../payment.php:385 +#: ../../../payment.php:386 ../../../payment.php:504 ../../../payment.php:507 +#: ../../../payment.php:508 msgid "Treated" msgstr "Tratada" -#: ../../../payment.php:315 ../../../payment.php:341 ../../../payment.php:360 -#: ../../../payment.php:361 ../../../payment.php:362 ../../../payment.php:509 -#: ../../../payment.php:510 ../../../payment.php:512 ../../../payment.php:513 +#: ../../../payment.php:308 ../../../payment.php:334 ../../../payment.php:353 +#: ../../../payment.php:354 ../../../payment.php:355 ../../../payment.php:503 +#: ../../../payment.php:504 ../../../payment.php:506 ../../../payment.php:507 msgid "Yes" msgstr "Si" -#: ../../../payment.php:315 ../../../payment.php:341 ../../../payment.php:360 -#: ../../../payment.php:361 ../../../paymentOrder.php:82 +#: ../../../payment.php:308 ../../../payment.php:334 ../../../payment.php:353 +#: ../../../payment.php:354 ../../../paymentOrder.php:82 msgid "Not treated" msgstr "No se trata" -#: ../../../payment.php:354 +#: ../../../payment.php:347 msgid "Transfer" msgstr "Transferencia" -#: ../../../payment.php:360 ../../../paymentOrder.php:78 +#: ../../../payment.php:353 ../../../paymentOrder.php:78 msgid "Not paid" msgstr "No pagado" -#: ../../../payment.php:378 ../../../payment.php:509 ../../../payment.php:512 -#: ../../../payment.php:514 ../../../paymentOrder.php:81 +#: ../../../payment.php:371 ../../../payment.php:503 ../../../payment.php:506 +#: ../../../payment.php:508 ../../../paymentOrder.php:81 msgid "Paid" msgstr "Pagado" -#: ../../../payment.php:379 ../../../payment.php:381 ../../../payment.php:394 -#: ../../../payment.php:396 ../../../payment.php:410 ../../../payment.php:412 -#: ../../../payment.php:417 ../../../payment.php:423 ../../../payment.php:428 -#: ../../../payment.php:536 ../../../paymentOrder.php:27 +#: ../../../payment.php:372 ../../../payment.php:374 ../../../payment.php:387 +#: ../../../payment.php:389 ../../../payment.php:403 ../../../payment.php:405 +#: ../../../payment.php:410 ../../../payment.php:416 ../../../payment.php:421 +#: ../../../payment.php:530 ../../../paymentOrder.php:27 #: ../../../paymentOrder.php:87 msgid "Error" msgstr "Error" -#: ../../../payment.php:407 ../../../payment.php:408 ../../../payment.php:409 -#: ../../../payment.php:514 +#: ../../../payment.php:400 ../../../payment.php:401 ../../../payment.php:402 +#: ../../../payment.php:508 msgid "Reset" msgstr "Reiniciar" -#: ../../../payment.php:416 +#: ../../../payment.php:409 msgid "Deleted" msgstr "Suprimido" -#: ../../../payment.php:422 +#: ../../../payment.php:415 msgid "Archived" msgstr "Archivado" -#: ../../../payment.php:427 +#: ../../../payment.php:420 msgid "Restored" msgstr "Restaurada" -#: ../../../payment.php:459 +#: ../../../payment.php:452 msgid "Restore" msgstr "Restaurar" -#: ../../../payment.php:477 ../../../paymentInc.php:42 -#: ../../../paymentInc.php:80 ../../../paymentInc.php:103 -#: ../../../paymentInc.php:104 ../../../paymentMake.php:29 +#: ../../../payment.php:471 ../../../paymentInc.php:42 +#: ../../../paymentInc.php:82 ../../../paymentInc.php:106 +#: ../../../paymentInc.php:107 ../../../paymentMake.php:31 #: ../../../paymentOrder.php:46 ../../../paymentPdf.php:44 msgid "Order" msgstr "Solicitar" -#: ../../../payment.php:479 ../../../paymentOrder.php:48 +#: ../../../payment.php:473 ../../../paymentOrder.php:48 #: ../../../paymentPdf.php:46 ../../../paymentPdf.php:58 msgid "Ref" msgstr "Ref" -#: ../../../payment.php:479 ../../../paymentOrder.php:48 +#: ../../../payment.php:473 ../../../paymentOrder.php:48 msgid "Quantity" msgstr "Cantidad" -#: ../../../payment.php:479 ../../../payment.php:493 ../../../paymentInc.php:50 -#: ../../../paymentInc.php:106 ../../../paymentInc.php:107 +#: ../../../payment.php:473 ../../../payment.php:487 ../../../paymentInc.php:50 +#: ../../../paymentInc.php:109 ../../../paymentInc.php:110 #: ../../../paymentOrder.php:48 ../../../paymentOrder.php:62 #: ../../../paymentPdf.php:58 ../../../paymentPdf.php:98 msgid "Total" msgstr "Total" -#: ../../../payment.php:487 ../../../paymentOrder.php:56 +#: ../../../payment.php:481 ../../../paymentOrder.php:56 #: ../../../paymentPdf.php:87 msgid "Subtotal" msgstr "Total parcial" -#: ../../../payment.php:495 ../../../paymentOrder.php:64 +#: ../../../payment.php:489 ../../../paymentOrder.php:64 #: ../../../paymentPdf.php:103 msgid "Shipping address" msgstr "Dirección de envío" -#: ../../../payment.php:501 ../../../paymentInc.php:55 -#: ../../../paymentInc.php:124 ../../../paymentInc.php:138 +#: ../../../payment.php:495 ../../../paymentInc.php:55 +#: ../../../paymentInc.php:127 ../../../paymentInc.php:141 #: ../../../paymentOrder.php:70 ../../../paymentPdf.php:113 msgid "Mail" msgstr "Mail" -#: ../../../payment.php:506 ../../../paymentOrder.php:75 +#: ../../../payment.php:500 ../../../paymentOrder.php:75 #: ../../../paymentPdf.php:54 msgid "Payment" msgstr "Pago" -#: ../../../payment.php:507 ../../../payment.php:518 +#: ../../../payment.php:501 ../../../payment.php:512 msgid "Are you sure ?" msgstr "¿Seguro?" -#: ../../../payment.php:507 +#: ../../../payment.php:501 msgid "Delete" msgstr "Borrar" -#: ../../../payment.php:509 ../../../payment.php:510 ../../../payment.php:514 +#: ../../../payment.php:503 ../../../payment.php:504 ../../../payment.php:508 msgid "No" msgstr "No" -#: ../../../payment.php:517 ../../../paymentOrder.php:84 +#: ../../../payment.php:511 ../../../paymentOrder.php:84 msgid "Invoice in PDF" msgstr "Factura en PDF" -#: ../../../payment.php:518 +#: ../../../payment.php:512 msgid "Archive" msgstr "Archivo" @@ -511,14 +503,6 @@ msgstr "Archivo" msgid "Shipping" msgstr "Envío" -#: ../../../paymentInc.php:57 -msgid "Secure payment by card" -msgstr "Pago seguro con tarjeta" - -#: ../../../paymentInc.php:58 -msgid "Pay with your Paypal account" -msgstr "Pague con su cuenta de Paypal" - #: ../../../paymentInc.php:59 msgid "Pay by cheque" msgstr "Pague con cheque" @@ -527,35 +511,35 @@ msgstr "Pague con cheque" msgid "Bank transfer" msgstr "Transferencia" -#: ../../../paymentInc.php:62 +#: ../../../paymentInc.php:64 msgid "Fields are mandatory" msgstr "Los campos son obligatorios" -#: ../../../paymentInc.php:62 ../../../paymentInc.php:152 +#: ../../../paymentInc.php:64 ../../../paymentInc.php:155 msgid "Invalid email" msgstr "Email inválido" -#: ../../../paymentInc.php:117 +#: ../../../paymentInc.php:120 msgid "Follow the evolution of your order" msgstr "Siga la evolución de su pedido" -#: ../../../paymentInc.php:118 +#: ../../../paymentInc.php:121 msgid "Cancel this order" msgstr "Cancelar este pedido" -#: ../../../paymentInc.php:123 ../../../paymentInc.php:125 +#: ../../../paymentInc.php:126 ../../../paymentInc.php:128 msgid "Send your cheque to the following address" msgstr "Envíe su cheque a la siguiente dirección" -#: ../../../paymentInc.php:123 ../../../paymentInc.php:125 +#: ../../../paymentInc.php:126 ../../../paymentInc.php:128 msgid "Payable to" msgstr "A pagar en el" -#: ../../../paymentInc.php:125 ../../../paymentInc.php:139 +#: ../../../paymentInc.php:128 ../../../paymentInc.php:142 msgid "Ref to mention" msgstr "Ref mencionar" -#: ../../../paymentInc.php:126 ../../../paymentInc.php:140 +#: ../../../paymentInc.php:129 ../../../paymentInc.php:143 msgid "" "We expect your payment within 10 days. After this time, the order will be " "destroyed." @@ -563,24 +547,24 @@ msgstr "" "Esperamos que su pago dentro de 10 días. Después de este tiempo, la orden " "será destruido." -#: ../../../paymentInc.php:127 ../../../paymentInc.php:141 -#: ../../../paymentInc.php:149 ../../../paymentPdf.php:121 +#: ../../../paymentInc.php:130 ../../../paymentInc.php:144 +#: ../../../paymentInc.php:152 ../../../paymentPdf.php:121 msgid "Thank you for your trust." msgstr "Gracias por tu confianza." -#: ../../../paymentInc.php:129 +#: ../../../paymentInc.php:132 msgid "New order by cheque" msgstr "Nuevo orden por cheque" -#: ../../../paymentInc.php:137 ../../../paymentInc.php:139 +#: ../../../paymentInc.php:140 ../../../paymentInc.php:142 msgid "Transfer your payment to the following account" msgstr "Transfiera su pago a la siguiente cuenta" -#: ../../../paymentInc.php:143 +#: ../../../paymentInc.php:146 msgid "New order by bank transfer" msgstr "Nuevo orden por transferencia" -#: ../../../paymentInc.php:149 +#: ../../../paymentInc.php:152 msgid "A summary email with the elements for payment was sent to you." msgstr "" "Un email de resumen con los elementos para el pago fue enviado a usted." @@ -600,3 +584,21 @@ msgstr "Sale para la entrega" #: ../../../paymentPdf.php:40 msgid "Invoice" msgstr "Factura" + +#~ msgid "Paypal" +#~ msgstr "Paypal" + +#~ msgid "Paypal Plugin needed. EXT mode must be activated." +#~ msgstr "PayPal Plugin necesario. Modo EXT debe estar activado." + +#~ msgid "Payplug" +#~ msgstr "Payplug" + +#~ msgid "Payplug Plugin needed. EXT mode must be activated." +#~ msgstr "Payplug Plugin necesario. Modo EXT debe estar activado." + +#~ msgid "Secure payment by card" +#~ msgstr "Pago seguro con tarjeta" + +#~ msgid "Pay with your Paypal account" +#~ msgstr "Pague con su cuenta de Paypal" diff --git a/lang/fr_FR.utf8/LC_MESSAGES/payment.mo b/lang/fr_FR.utf8/LC_MESSAGES/payment.mo index a24368a..99d96b3 100755 Binary files a/lang/fr_FR.utf8/LC_MESSAGES/payment.mo and b/lang/fr_FR.utf8/LC_MESSAGES/payment.mo differ diff --git a/lang/fr_FR.utf8/LC_MESSAGES/payment.po b/lang/fr_FR.utf8/LC_MESSAGES/payment.po index 605323f..9c1fb7e 100755 --- a/lang/fr_FR.utf8/LC_MESSAGES/payment.po +++ b/lang/fr_FR.utf8/LC_MESSAGES/payment.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: CmsUno\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-21 12:34+0200\n" -"PO-Revision-Date: 2017-05-21 13:03+0200\n" +"POT-Creation-Date: 2017-11-15 10:19+0100\n" +"PO-Revision-Date: 2017-11-15 10:20+0100\n" "Last-Translator: jacques Malgrange \n" "Language-Team: Jacques Malgrange \n" "Language: fr_FR\n" @@ -18,7 +18,7 @@ msgstr "" "X-Generator: Poedit 1.8.12\n" "X-Poedit-SearchPath-0: ../../..\n" -#: ../../../payment.php:22 ../../../payment.php:453 +#: ../../../payment.php:22 ../../../payment.php:446 msgid "Archives" msgstr "Archives" @@ -34,7 +34,7 @@ msgstr "Configuration" msgid "Orders" msgstr "Commandes" -#: ../../../payment.php:25 ../../../payment.php:478 +#: ../../../payment.php:25 ../../../payment.php:472 #: ../../../paymentOrder.php:47 ../../../paymentPdf.php:61 msgid "Order Details" msgstr "Détails de la commande" @@ -88,231 +88,223 @@ msgid "Active payment :" msgstr "Paiement actif :" #: ../../../payment.php:35 -msgid "Paypal" -msgstr "Paypal" +msgid "External payment" +msgstr "Paiement externe" #: ../../../payment.php:37 -msgid "Paypal Plugin needed. EXT mode must be activated." -msgstr "Le plugin Paypal est requis. Le mode EXT doit être coché." +msgid "Payment enabled with another plugin (Paypal...)." +msgstr "Paiement activé avec un autre plugin (Paypal ...)." -#: ../../../payment.php:40 -msgid "Payplug" -msgstr "Payplug" - -#: ../../../payment.php:42 -msgid "Payplug Plugin needed. EXT mode must be activated." -msgstr "Le plugin Payplug est requis. Le mode EXT doit être coché." - -#: ../../../payment.php:45 ../../../payment.php:505 +#: ../../../payment.php:40 ../../../payment.php:499 #: ../../../paymentOrder.php:74 ../../../paymentPdf.php:56 msgid "Bank Transfer" msgstr "Virement bancaire" -#: ../../../payment.php:47 +#: ../../../payment.php:42 msgid "Enable the payment by bank transfer" msgstr "Active le paiement par virement bancaire" -#: ../../../payment.php:50 ../../../payment.php:353 ../../../payment.php:504 +#: ../../../payment.php:45 ../../../payment.php:346 ../../../payment.php:498 #: ../../../paymentOrder.php:73 ../../../paymentPdf.php:56 msgid "Cheque" msgstr "Chèque" -#: ../../../payment.php:52 +#: ../../../payment.php:47 msgid "Enable the payment by cheque" msgstr "Activer le paiement par chèque" -#: ../../../payment.php:55 +#: ../../../payment.php:50 msgid "Payment Address" msgstr "Adresse du paiement" -#: ../../../payment.php:57 +#: ../../../payment.php:52 msgid "Cheque only. What name-address should the payment be sent ?" msgstr "Chèque uniquement. A quel Nom-Adresse doit-on envoyer le chèque ?" -#: ../../../payment.php:60 +#: ../../../payment.php:55 msgid "Account owner" msgstr "Propriétaire du compte" -#: ../../../payment.php:62 +#: ../../../payment.php:57 msgid "Cheque and Bank transfer. Cheque payable to (name, society...)" msgstr "Chèque et Virement. Paiement à l'ordre de (nom, société...)" -#: ../../../payment.php:65 ../../../paymentInc.php:137 -#: ../../../paymentInc.php:139 +#: ../../../payment.php:60 ../../../paymentInc.php:140 +#: ../../../paymentInc.php:142 msgid "IBAN" msgstr "IBAN" -#: ../../../payment.php:67 +#: ../../../payment.php:62 msgid "Bank transfer only. International Bank Account Number" msgstr "Virement uniquement. International Bank Account Number" -#: ../../../payment.php:70 ../../../paymentInc.php:137 -#: ../../../paymentInc.php:139 +#: ../../../payment.php:65 ../../../paymentInc.php:140 +#: ../../../paymentInc.php:142 msgid "BIC" msgstr "BIC" -#: ../../../payment.php:72 +#: ../../../payment.php:67 msgid "Bank transfer only. Bank Identification Code" msgstr "Virement uniquement. Bank Identification Code" -#: ../../../payment.php:75 +#: ../../../payment.php:70 msgid "Tax and shipping :" msgstr "Taxe et livraison :" -#: ../../../payment.php:76 +#: ../../../payment.php:71 msgid "You can create up to 4 fixed or proportional taxes." msgstr "Vous pouvez créer jusqu'à 4 taxes proportionnelles ou fixes." -#: ../../../payment.php:76 +#: ../../../payment.php:71 msgid "A proportional tax is written with the sign" msgstr "Une taxe proportionnelle doit être suivi du signe" -#: ../../../payment.php:79 ../../../payment.php:85 ../../../payment.php:91 -#: ../../../payment.php:97 ../../../payment.php:479 ../../../paymentInc.php:45 +#: ../../../payment.php:74 ../../../payment.php:80 ../../../payment.php:86 +#: ../../../payment.php:92 ../../../payment.php:473 ../../../paymentInc.php:45 #: ../../../paymentOrder.php:48 ../../../paymentPdf.php:58 msgid "Tax" msgstr "Taxe" -#: ../../../payment.php:81 ../../../payment.php:87 ../../../payment.php:93 -#: ../../../payment.php:99 +#: ../../../payment.php:76 ../../../payment.php:82 ../../../payment.php:88 +#: ../../../payment.php:94 msgid "Enabled by default" msgstr "Activé par défaut" -#: ../../../payment.php:82 +#: ../../../payment.php:77 msgid "Example : Fixed (0.55$) => 0.55 ; Proportional (19.6%) => 19.6%" msgstr "Exemple : Fixe (0.55€) => 0.55 ; Proportionnelle (19.6%) => 19.6%" -#: ../../../payment.php:103 +#: ../../../payment.php:98 msgid "I enter my prices :" msgstr "J'entre mes prix :" -#: ../../../payment.php:106 ../../../payment.php:116 +#: ../../../payment.php:101 ../../../payment.php:111 msgid "Tax included" msgstr "Taxe comprise (TTC)" -#: ../../../payment.php:107 ../../../payment.php:117 +#: ../../../payment.php:102 ../../../payment.php:112 msgid "Duty free" msgstr "Hors taxe (HT)" -#: ../../../payment.php:110 +#: ../../../payment.php:105 msgid "When I set the price of an item, the tax is ..." msgstr "Lorsque je fixe le prix d'un article, la taxe est ..." -#: ../../../payment.php:113 +#: ../../../payment.php:108 msgid "Prices displayed :" msgstr "Prix affichés :" -#: ../../../payment.php:120 +#: ../../../payment.php:115 msgid "On the site, the price of the item is displayed..." msgstr "Sur le site, les prix des articles sont affichés ..." -#: ../../../payment.php:123 ../../../payment.php:125 ../../../payment.php:490 +#: ../../../payment.php:118 ../../../payment.php:120 ../../../payment.php:484 #: ../../../paymentGetData.php:8 ../../../paymentInc.php:48 -#: ../../../paymentInc.php:103 ../../../paymentInc.php:104 +#: ../../../paymentInc.php:106 ../../../paymentInc.php:107 #: ../../../paymentOrder.php:59 ../../../paymentPdf.php:93 msgid "Shipping cost" msgstr "Frais de livraison" -#: ../../../payment.php:128 +#: ../../../payment.php:123 msgid "Cart :" msgstr "Panier :" -#: ../../../payment.php:131 +#: ../../../payment.php:126 msgid "No Add To Cart button" msgstr "Pas de bouton Ajouter au panier" -#: ../../../payment.php:133 +#: ../../../payment.php:128 msgid "You don't want to use the CKEditor Add To Cart Button." msgstr "" "Vous ne voulez pas utiliser le bouton Ajouter au panier avec CKEditor. Le " "bouton ne sera pas chargé." -#: ../../../payment.php:136 +#: ../../../payment.php:131 msgid "Currency" msgstr "Monnaie" -#: ../../../payment.php:139 +#: ../../../payment.php:134 msgid "Euro" msgstr "Euro" -#: ../../../payment.php:140 +#: ../../../payment.php:135 msgid "US Dollar" msgstr "Dollar US" -#: ../../../payment.php:141 +#: ../../../payment.php:136 msgid "Canadian Dollar" msgstr "Dollar Canadien" -#: ../../../payment.php:142 +#: ../../../payment.php:137 msgid "Pound Sterling" msgstr "Livre Sterling" -#: ../../../payment.php:143 +#: ../../../payment.php:138 msgid "Swiss Franc" msgstr "Franc Suisse" -#: ../../../payment.php:144 +#: ../../../payment.php:139 msgid "Danish Krone" msgstr "Couronne Danoise" -#: ../../../payment.php:145 +#: ../../../payment.php:140 msgid "Norwegian Krone" msgstr "Couronne Norvégienne" -#: ../../../payment.php:146 +#: ../../../payment.php:141 msgid "Swedish Krona" msgstr "Couronne Suédoise" -#: ../../../payment.php:147 +#: ../../../payment.php:142 msgid "Polish Zloty" msgstr "Zloty Polonais" -#: ../../../payment.php:148 +#: ../../../payment.php:143 msgid "Russian Ruble" msgstr "Rouble Russe" -#: ../../../payment.php:151 +#: ../../../payment.php:146 msgid "What is the currency of payment." msgstr "Quelle est la monnaie du paiement" -#: ../../../payment.php:154 +#: ../../../payment.php:149 msgid "Integration" msgstr "Intégration" -#: ../../../payment.php:157 +#: ../../../payment.php:152 msgid "Shortcode" msgstr "Shortcode" -#: ../../../payment.php:158 +#: ../../../payment.php:153 msgid "Menu" msgstr "Menu" -#: ../../../payment.php:161 +#: ../../../payment.php:156 msgid "Use the shortcode [[paymentCart]] or use auto integration in the menu." msgstr "" "Utiliser le shortcode [[paymentCart]] ou intégrer directement dans le menu." -#: ../../../payment.php:164 +#: ../../../payment.php:159 msgid "Box alignment" msgstr "Alignement de la boite" -#: ../../../payment.php:167 +#: ../../../payment.php:162 msgid "Left" msgstr "Gauche" -#: ../../../payment.php:168 +#: ../../../payment.php:163 msgid "Right" msgstr "Droite" -#: ../../../payment.php:171 +#: ../../../payment.php:166 msgid "Use Right if the cart appears to the right of the window." msgstr "Mettre Droite si le panier apparaît à droite de la fenêtre." -#: ../../../payment.php:174 +#: ../../../payment.php:169 msgid "Box color" msgstr "Couleur de la boite" -#: ../../../payment.php:176 +#: ../../../payment.php:171 msgid "" "Background color for the cart. HTML format (ex : #9f9f9f). Leave blank for " "automatic choice." @@ -320,190 +312,190 @@ msgstr "" "Couleur d'arrière plan pour la boite. Format HTML (ex : #9f9f9f). Laisser " "vide pour automatique." -#: ../../../payment.php:179 +#: ../../../payment.php:174 msgid "Icon color" msgstr "Couleur logo" -#: ../../../payment.php:182 +#: ../../../payment.php:177 msgid "Black" msgstr "Noir" -#: ../../../payment.php:183 +#: ../../../payment.php:178 msgid "White" msgstr "Blanc" -#: ../../../payment.php:186 +#: ../../../payment.php:181 msgid "Color of the cart icon and the text." msgstr "Couleur du logo du panier et du texte." -#: ../../../payment.php:189 +#: ../../../payment.php:184 msgid "Save" msgstr "Enregistrer" -#: ../../../payment.php:229 +#: ../../../payment.php:222 msgid "Backup performed" msgstr "Sauvegarde effectuée" -#: ../../../payment.php:230 +#: ../../../payment.php:223 msgid "Impossible backup" msgstr "Sauvegarde impossible" -#: ../../../payment.php:234 +#: ../../../payment.php:227 msgid "List of orders" msgstr "Liste des commandes" -#: ../../../payment.php:272 ../../../paymentPdf.php:50 +#: ../../../payment.php:265 ../../../paymentPdf.php:50 msgid "Date" msgstr "Date" -#: ../../../payment.php:272 +#: ../../../payment.php:265 msgid "Type" msgstr "Type" -#: ../../../payment.php:272 ../../../payment.php:479 ../../../payment.php:499 -#: ../../../paymentInc.php:53 ../../../paymentInc.php:124 -#: ../../../paymentInc.php:137 ../../../paymentInc.php:138 -#: ../../../paymentInc.php:139 ../../../paymentOrder.php:48 +#: ../../../payment.php:265 ../../../payment.php:473 ../../../payment.php:493 +#: ../../../paymentInc.php:53 ../../../paymentInc.php:127 +#: ../../../paymentInc.php:140 ../../../paymentInc.php:141 +#: ../../../paymentInc.php:142 ../../../paymentOrder.php:48 #: ../../../paymentOrder.php:68 ../../../paymentPdf.php:58 #: ../../../paymentPdf.php:105 msgid "Name" msgstr "Nom" -#: ../../../payment.php:272 ../../../payment.php:500 ../../../paymentInc.php:54 -#: ../../../paymentInc.php:124 ../../../paymentInc.php:138 +#: ../../../payment.php:265 ../../../payment.php:494 ../../../paymentInc.php:54 +#: ../../../paymentInc.php:127 ../../../paymentInc.php:141 #: ../../../paymentOrder.php:69 ../../../paymentPdf.php:109 msgid "Address" msgstr "Adresse" -#: ../../../payment.php:272 +#: ../../../payment.php:265 msgid "Article" msgstr "Article" -#: ../../../payment.php:272 ../../../payment.php:479 +#: ../../../payment.php:265 ../../../payment.php:473 #: ../../../paymentOrder.php:48 ../../../paymentPdf.php:58 msgid "Price" msgstr "Prix" -#: ../../../payment.php:272 ../../../payment.php:391 ../../../payment.php:392 -#: ../../../payment.php:393 ../../../payment.php:510 ../../../payment.php:513 -#: ../../../payment.php:514 +#: ../../../payment.php:265 ../../../payment.php:384 ../../../payment.php:385 +#: ../../../payment.php:386 ../../../payment.php:504 ../../../payment.php:507 +#: ../../../payment.php:508 msgid "Treated" msgstr "Traité" -#: ../../../payment.php:315 ../../../payment.php:341 ../../../payment.php:360 -#: ../../../payment.php:361 ../../../payment.php:362 ../../../payment.php:509 -#: ../../../payment.php:510 ../../../payment.php:512 ../../../payment.php:513 +#: ../../../payment.php:308 ../../../payment.php:334 ../../../payment.php:353 +#: ../../../payment.php:354 ../../../payment.php:355 ../../../payment.php:503 +#: ../../../payment.php:504 ../../../payment.php:506 ../../../payment.php:507 msgid "Yes" msgstr "Oui" -#: ../../../payment.php:315 ../../../payment.php:341 ../../../payment.php:360 -#: ../../../payment.php:361 ../../../paymentOrder.php:82 +#: ../../../payment.php:308 ../../../payment.php:334 ../../../payment.php:353 +#: ../../../payment.php:354 ../../../paymentOrder.php:82 msgid "Not treated" msgstr "Non traité" -#: ../../../payment.php:354 +#: ../../../payment.php:347 msgid "Transfer" msgstr "Virement" -#: ../../../payment.php:360 ../../../paymentOrder.php:78 +#: ../../../payment.php:353 ../../../paymentOrder.php:78 msgid "Not paid" msgstr "Non payé" -#: ../../../payment.php:378 ../../../payment.php:509 ../../../payment.php:512 -#: ../../../payment.php:514 ../../../paymentOrder.php:81 +#: ../../../payment.php:371 ../../../payment.php:503 ../../../payment.php:506 +#: ../../../payment.php:508 ../../../paymentOrder.php:81 msgid "Paid" msgstr "Payé" -#: ../../../payment.php:379 ../../../payment.php:381 ../../../payment.php:394 -#: ../../../payment.php:396 ../../../payment.php:410 ../../../payment.php:412 -#: ../../../payment.php:417 ../../../payment.php:423 ../../../payment.php:428 -#: ../../../payment.php:536 ../../../paymentOrder.php:27 +#: ../../../payment.php:372 ../../../payment.php:374 ../../../payment.php:387 +#: ../../../payment.php:389 ../../../payment.php:403 ../../../payment.php:405 +#: ../../../payment.php:410 ../../../payment.php:416 ../../../payment.php:421 +#: ../../../payment.php:530 ../../../paymentOrder.php:27 #: ../../../paymentOrder.php:87 msgid "Error" msgstr "Erreur" -#: ../../../payment.php:407 ../../../payment.php:408 ../../../payment.php:409 -#: ../../../payment.php:514 +#: ../../../payment.php:400 ../../../payment.php:401 ../../../payment.php:402 +#: ../../../payment.php:508 msgid "Reset" msgstr "Remise à zéro" -#: ../../../payment.php:416 +#: ../../../payment.php:409 msgid "Deleted" msgstr "Supprimé" -#: ../../../payment.php:422 +#: ../../../payment.php:415 msgid "Archived" msgstr "Archivé" -#: ../../../payment.php:427 +#: ../../../payment.php:420 msgid "Restored" msgstr "Restauré" -#: ../../../payment.php:459 +#: ../../../payment.php:452 msgid "Restore" msgstr "Restorer" -#: ../../../payment.php:477 ../../../paymentInc.php:42 -#: ../../../paymentInc.php:80 ../../../paymentInc.php:103 -#: ../../../paymentInc.php:104 ../../../paymentMake.php:29 +#: ../../../payment.php:471 ../../../paymentInc.php:42 +#: ../../../paymentInc.php:82 ../../../paymentInc.php:106 +#: ../../../paymentInc.php:107 ../../../paymentMake.php:31 #: ../../../paymentOrder.php:46 ../../../paymentPdf.php:44 msgid "Order" msgstr "Commande" -#: ../../../payment.php:479 ../../../paymentOrder.php:48 +#: ../../../payment.php:473 ../../../paymentOrder.php:48 #: ../../../paymentPdf.php:46 ../../../paymentPdf.php:58 msgid "Ref" msgstr "Ref" -#: ../../../payment.php:479 ../../../paymentOrder.php:48 +#: ../../../payment.php:473 ../../../paymentOrder.php:48 msgid "Quantity" msgstr "Quantité" -#: ../../../payment.php:479 ../../../payment.php:493 ../../../paymentInc.php:50 -#: ../../../paymentInc.php:106 ../../../paymentInc.php:107 +#: ../../../payment.php:473 ../../../payment.php:487 ../../../paymentInc.php:50 +#: ../../../paymentInc.php:109 ../../../paymentInc.php:110 #: ../../../paymentOrder.php:48 ../../../paymentOrder.php:62 #: ../../../paymentPdf.php:58 ../../../paymentPdf.php:98 msgid "Total" msgstr "Total" -#: ../../../payment.php:487 ../../../paymentOrder.php:56 +#: ../../../payment.php:481 ../../../paymentOrder.php:56 #: ../../../paymentPdf.php:87 msgid "Subtotal" msgstr "Sous-Total" -#: ../../../payment.php:495 ../../../paymentOrder.php:64 +#: ../../../payment.php:489 ../../../paymentOrder.php:64 #: ../../../paymentPdf.php:103 msgid "Shipping address" msgstr "Adresse de livraison" -#: ../../../payment.php:501 ../../../paymentInc.php:55 -#: ../../../paymentInc.php:124 ../../../paymentInc.php:138 +#: ../../../payment.php:495 ../../../paymentInc.php:55 +#: ../../../paymentInc.php:127 ../../../paymentInc.php:141 #: ../../../paymentOrder.php:70 ../../../paymentPdf.php:113 msgid "Mail" msgstr "Mail" -#: ../../../payment.php:506 ../../../paymentOrder.php:75 +#: ../../../payment.php:500 ../../../paymentOrder.php:75 #: ../../../paymentPdf.php:54 msgid "Payment" msgstr "Paiement" -#: ../../../payment.php:507 ../../../payment.php:518 +#: ../../../payment.php:501 ../../../payment.php:512 msgid "Are you sure ?" msgstr "Etes-vous certain ?" -#: ../../../payment.php:507 +#: ../../../payment.php:501 msgid "Delete" msgstr "Suppression" -#: ../../../payment.php:509 ../../../payment.php:510 ../../../payment.php:514 +#: ../../../payment.php:503 ../../../payment.php:504 ../../../payment.php:508 msgid "No" msgstr "Non" -#: ../../../payment.php:517 ../../../paymentOrder.php:84 +#: ../../../payment.php:511 ../../../paymentOrder.php:84 msgid "Invoice in PDF" msgstr "Facture en PDF" -#: ../../../payment.php:518 +#: ../../../payment.php:512 msgid "Archive" msgstr "Archiver" @@ -511,14 +503,6 @@ msgstr "Archiver" msgid "Shipping" msgstr "Livraison" -#: ../../../paymentInc.php:57 -msgid "Secure payment by card" -msgstr "Paiement sécurisé par carte" - -#: ../../../paymentInc.php:58 -msgid "Pay with your Paypal account" -msgstr "Payer avec votre compte Paypal" - #: ../../../paymentInc.php:59 msgid "Pay by cheque" msgstr "Payer par chèque" @@ -527,35 +511,35 @@ msgstr "Payer par chèque" msgid "Bank transfer" msgstr "Virement bancaire" -#: ../../../paymentInc.php:62 +#: ../../../paymentInc.php:64 msgid "Fields are mandatory" msgstr "Les champs sont obligatoires" -#: ../../../paymentInc.php:62 ../../../paymentInc.php:152 +#: ../../../paymentInc.php:64 ../../../paymentInc.php:155 msgid "Invalid email" msgstr "Email invalide" -#: ../../../paymentInc.php:117 +#: ../../../paymentInc.php:120 msgid "Follow the evolution of your order" msgstr "Suivre l'évolution de la commande" -#: ../../../paymentInc.php:118 +#: ../../../paymentInc.php:121 msgid "Cancel this order" msgstr "Annuler cette commande" -#: ../../../paymentInc.php:123 ../../../paymentInc.php:125 +#: ../../../paymentInc.php:126 ../../../paymentInc.php:128 msgid "Send your cheque to the following address" msgstr "Envoyez votre chèque à l'adresse suivante" -#: ../../../paymentInc.php:123 ../../../paymentInc.php:125 +#: ../../../paymentInc.php:126 ../../../paymentInc.php:128 msgid "Payable to" msgstr "A l'ordre de" -#: ../../../paymentInc.php:125 ../../../paymentInc.php:139 +#: ../../../paymentInc.php:128 ../../../paymentInc.php:142 msgid "Ref to mention" msgstr "Ref à mentionner" -#: ../../../paymentInc.php:126 ../../../paymentInc.php:140 +#: ../../../paymentInc.php:129 ../../../paymentInc.php:143 msgid "" "We expect your payment within 10 days. After this time, the order will be " "destroyed." @@ -563,24 +547,24 @@ msgstr "" "Nous attendons votre paiement sous 10 jours. Passé ce délais, la commande " "sera supprimée." -#: ../../../paymentInc.php:127 ../../../paymentInc.php:141 -#: ../../../paymentInc.php:149 ../../../paymentPdf.php:121 +#: ../../../paymentInc.php:130 ../../../paymentInc.php:144 +#: ../../../paymentInc.php:152 ../../../paymentPdf.php:121 msgid "Thank you for your trust." msgstr "Merci pour votre confiance." -#: ../../../paymentInc.php:129 +#: ../../../paymentInc.php:132 msgid "New order by cheque" msgstr "Nouvelle commande par chèque" -#: ../../../paymentInc.php:137 ../../../paymentInc.php:139 +#: ../../../paymentInc.php:140 ../../../paymentInc.php:142 msgid "Transfer your payment to the following account" msgstr "Effectuez un virement vers le compte suivant" -#: ../../../paymentInc.php:143 +#: ../../../paymentInc.php:146 msgid "New order by bank transfer" msgstr "Nouvelle commande par virement" -#: ../../../paymentInc.php:149 +#: ../../../paymentInc.php:152 msgid "A summary email with the elements for payment was sent to you." msgstr "" "Un email récapitulatif contenant les éléments du paiement vous a été envoyé." @@ -600,3 +584,21 @@ msgstr "En cours de livraison" #: ../../../paymentPdf.php:40 msgid "Invoice" msgstr "Facture" + +#~ msgid "Paypal" +#~ msgstr "Paypal" + +#~ msgid "Paypal Plugin needed. EXT mode must be activated." +#~ msgstr "Le plugin Paypal est requis. Le mode EXT doit être coché." + +#~ msgid "Payplug" +#~ msgstr "Payplug" + +#~ msgid "Payplug Plugin needed. EXT mode must be activated." +#~ msgstr "Le plugin Payplug est requis. Le mode EXT doit être coché." + +#~ msgid "Secure payment by card" +#~ msgstr "Paiement sécurisé par carte" + +#~ msgid "Pay with your Paypal account" +#~ msgstr "Payer avec votre compte Paypal" diff --git a/payment.css b/payment.css index 744a1a3..fefda5b 100755 --- a/payment.css +++ b/payment.css @@ -8,4 +8,5 @@ table.paymentTO td.paymentTN:nth-child(2){color:inherit;} .paymentDate{float:right;width:auto;font-size:1.1em;padding:0 30px 0 0;margin:0;} .paymentListArchiv{float:left;width:24%;cursor:pointer;text-decoration:underline;} #paymentArchData{margin-bottom:10px;} -#paymentArchiv{margin:15px 10px;} \ No newline at end of file +#paymentArchiv{margin:15px 10px;} +#payExt{text-transform:uppercase;padding:0 10px;font-weight:700;} diff --git a/payment.js b/payment.js index df3dd33..5d7fdf3 100755 --- a/payment.js +++ b/payment.js @@ -4,9 +4,6 @@ // function f_save_payment(){ jQuery(document).ready(function(){ - var ppal=document.getElementById('pml').checked?1:0; - var plug=document.getElementById('pmg').checked?1:0; - var coin=document.getElementById('pmo').checked?1:0; var vire=document.getElementById('pmv').checked?1:0; var cheq=document.getElementById('pmc').checked?1:0; var adre=document.getElementById("pma").value; @@ -30,19 +27,29 @@ function f_save_payment(){ var ali=document.getElementById("ali").options[document.getElementById("ali").selectedIndex].value; var col=document.getElementById("col").value; var ico=document.getElementById("ico").options[document.getElementById("ico").selectedIndex].value; - jQuery.post('uno/plugins/payment/payment.php',{'action':'save','unox':Unox,'ppal':ppal,'plug':plug,'coin':coin,'vire':vire,'cheq':cheq,'adre':adre,'own':own,'iban':iban,'bic':bic,'taa':taa,'tab':tab,'tac':tac,'tad':tad,'tda':tda,'tdb':tdb,'tdc':tdc,'tdd':tdd,'taxin':taxin,'taxout':taxout,'ship':ship,'addtocartoff':off,'curr':curr,'it':it,'ali':ali,'col':col,'ico':ico},function(r){ + jQuery.post('uno/plugins/payment/payment.php',{'action':'save','unox':Unox,'vire':vire,'cheq':cheq,'adre':adre,'own':own,'iban':iban,'bic':bic,'taa':taa,'tab':tab,'tac':tac,'tad':tad,'tda':tda,'tdb':tdb,'tdc':tdc,'tdd':tdd,'taxin':taxin,'taxout':taxout,'ship':ship,'addtocartoff':off,'curr':curr,'it':it,'ali':ali,'col':col,'ico':ico},function(r){ f_alert(r); }); }); } function f_load_payment(){ jQuery(document).ready(function(){ - jQuery.getJSON("uno/data/"+Ubusy+"/payment.json?r="+Math.random(),function(data){ - if(data.method.ppal==1)document.getElementById('pml').checked=true;else document.getElementById('pml').checked=false; - if(data.method.plug==1)document.getElementById('pmg').checked=true;else document.getElementById('pmg').checked=false; - if(data.method.coin==1)document.getElementById('pmo').checked=true;else document.getElementById('pmo').checked=false; - if(data.method.vire==1)document.getElementById('pmv').checked=true;else document.getElementById('pmv').checked=false; - if(data.method.cheq==1)document.getElementById('pmc').checked=true;else document.getElementById('pmc').checked=false; + jQuery.getJSON("uno/data/payment.json?r="+Math.random(),function(data){ + if(data.method!=undefined){ + var a=''; + jQuery.each(data.method,function(k,v){ + if(k=='vire'){ + if(v==1)document.getElementById('pmv').checked=true; + else document.getElementById('pmv').checked=false; + } + else if(k=='cheq'){ + if(v==1)document.getElementById('pmc').checked=true; + else document.getElementById('pmc').checked=false; + } + else if(v==1)a+=k+','; + }); + if(a!='')document.getElementById('payExt').innerHTML=a.substr(0,a.length-1); + } if(data.adre!=undefined)document.getElementById('pma').value=data.adre; if(data.own!=undefined)document.getElementById('pmo').value=data.own; if(data.iban!=undefined)document.getElementById('pmi').value=data.iban; diff --git a/payment.php b/payment.php index b6a1a0e..1cf8c44 100755 --- a/payment.php +++ b/payment.php @@ -32,19 +32,9 @@

- - - - - - - - - - - - - + + + @@ -201,13 +191,10 @@ $v) if($k!='vire' && $k!='cheq' && !file_exists('../'.$k.'/'.$k.'.php')) unset($a['method'][$k]); $a['method']['vire'] = $_POST['vire']; $a['method']['cheq'] = $_POST['cheq']; $a['taa'] = $_POST['taa']; @@ -232,7 +219,7 @@ $a['iban'] = $_POST['iban']; $a['bic'] = $_POST['bic']; $out = json_encode($a); - if (file_put_contents('../../data/'.$Ubusy.'/payment.json', $out)) echo T_('Backup performed'); + if(file_put_contents('../../data/payment.json', $out)) echo T_('Backup performed'); else echo '!'.T_('Impossible backup'); break; // ******************************************************************************************** @@ -471,7 +458,7 @@ function sortTime($u1,$u2) {return (isset($u2['time'])?$u2['time']:0) - (isset($ { include('paymentGetData.php'); $q = file_get_contents('../../data/busy.json'); $a1 = json_decode($q,true); $Ubusy = $a1['nom']; - $q = file_get_contents('../../data/'.$Ubusy.'/payment.json'); $a1 = json_decode($q,true); $curr = $a1['curr']; + $q = file_get_contents('../../data/payment.json'); $a1 = json_decode($q,true); $curr = $a1['curr']; $q = file_get_contents('../../data/'.$Ubusy.'/addtocart.json'); $a2 = json_decode($q,true); if($curr=='EUR') $curr = '€'; else if($curr=='USD' || $curr=='CAD') $curr = '$'; diff --git a/paymentCkeditor.js.php b/paymentCkeditor.js.php old mode 100644 new mode 100755 index 9bd27d5..a1695c0 --- a/paymentCkeditor.js.php +++ b/paymentCkeditor.js.php @@ -7,10 +7,9 @@ 0?paymentCur:''); diff --git a/paymentInc.js b/paymentInc.js index 3656c70..73a56e1 100755 --- a/paymentInc.js +++ b/paymentInc.js @@ -50,11 +50,12 @@ function paymentBuy(){ if(x.readyState==4&&x.status==200&&x.responseText){ a=x.responseText.split('|;'); unoPop(a[1],0); - b=document.getElementById("popPlug");if(b)b.onclick=function(){var c=e(0),h=g(a[0],1);if(c==0)payplugCart(h);else d(c);}; - b=document.getElementById("popPpal");if(b)b.onclick=function(){var c=e(0),h=g(a[0],1);if(c==0)paypalCart(h);else d(c);}; - b=document.getElementById("popCoin");if(b)b.onclick=function(){var c=e(0),h=g(a[0],1);if(c==0)paycoinCart(h);else d(c);}; - b=document.getElementById("popCheq");if(b)b.onclick=function(){var c=e(0),h=g(a[0],0);if(c==0)paymentCVCart(h,0);else d(c);}; - b=document.getElementById("popVire");if(b)b.onclick=function(){var c=e(0),h=g(a[0],0);if(c==0)paymentCVCart(h,1);else d(c);}; + var po=/^pop/,t=document.getElementById("unoPop").getElementsByTagName('A'),i; + for(i=t.length;i--;)if(po.test(t[i].id)){ + if(t[i].id=="popCheq")t[i].onclick=function(){var c=e(0),h=g(a[0],0);if(c==0)paymentCVCart(h,0);else d(c);}; + else if(t[i].id=="popVire")t[i].onclick=function(){var c=e(0),h=g(a[0],0);if(c==0)paymentCVCart(h,1);else d(c);}; + else t[i].onclick=function(){var c=e(0),h=g(a[0],1),x=this.id.substr(3)+'Cart';alert(x);if(c==0)window[x](h);else d(c);}; + } } }; x.send(params); diff --git a/paymentInc.php b/paymentInc.php index 29d24e2..6726a14 100755 --- a/paymentInc.php +++ b/paymentInc.php @@ -17,7 +17,7 @@ if($cart) { $cartJson = ''; - $q1 = file_get_contents('../../data/'.$Ubusy.'/payment.json'); + $q1 = file_get_contents('../../data/payment.json'); $a1 = json_decode($q1,true); $q2 = file_get_contents('../../data/'.$Ubusy.'/addtocart.json'); $a2 = json_decode($q2,true); @@ -54,11 +54,12 @@ $o .= ''; $o .= '
'.T_("Address").'*
'.T_("Mail").'*
'; $o .= '
'; - if(isset($a1['method']['plug']) && $a1['method']['plug']) $o .= ''; - if(isset($a1['method']['ppal']) && $a1['method']['ppal']) $o .= ''; - if(isset($a1['method']['coin']) && $a1['method']['coin']) $o .= ''; - if(isset($a1['method']['cheq']) && $a1['method']['cheq']) $o .= ''; - if(isset($a1['method']['vire']) && $a1['method']['vire']) $o .= ''; + foreach($a1['method'] as $k=>$v) + { + if($k=='cheq' && $v) $o .= ''; + else if($k=='vire' && $v) $o .= ''; + else if($v) $o .= ''; + } $o .= '
'; echo $cartJson.'|;'.$o.'|;'.T_('Fields are mandatory').'|;'.T_('Invalid email'); } diff --git a/paymentMake.php b/paymentMake.php index ffd46e0..98f57a5 100755 --- a/paymentMake.php +++ b/paymentMake.php @@ -2,13 +2,13 @@ if (!isset($_SESSION['cmsuno'])) exit(); ?> '; - if(isset($a1['method']['ppal']) && $a1['method']['ppal']) $tmp1 .= ''; - if(isset($a1['method']['coin']) && $a1['method']['coin']) $tmp1 .= ''; - if(isset($a1['method']['cheq']) && $a1['method']['cheq']) $tmp1 .= ''; - if(isset($a1['method']['vire']) && $a1['method']['vire']) $tmp1 .= ''; + foreach($a1['method'] as $k=>$v) + { + if($k=='cheq' && $v) $tmp1 .= ''; + else if($k=='vire' && $v) $tmp1 .= ''; + else if(isset($Ua['plug'][$k]) && $v) $tmp1 .= ''; + } $tmp = ""."\r\n"; if(strpos($Uhtml.$Ucontent,'[[paymentCart]]')!==false || strpos($Uhtml.$Ucontent,'paymentAddC')!==false) { diff --git a/paymentPdf.php b/paymentPdf.php index da5b9eb..5df3c08 100755 --- a/paymentPdf.php +++ b/paymentPdf.php @@ -18,7 +18,7 @@ $a = json_decode($q,true); $q = file_get_contents('../../data/busy.json'); $a1 = json_decode($q,true); $Ubusy = $a1['nom']; $q = file_get_contents('../../data/'.$Ubusy.'/site.json'); $a1 = json_decode($q,true); $site = $a1['tit']; $url = $a1['url']; - $q = file_get_contents('../../data/'.$Ubusy.'/payment.json'); $a1 = json_decode($q,true); $curr = $a1['curr']; $ship = $a1['ship']; + $q = file_get_contents('../../data/payment.json'); $a1 = json_decode($q,true); $curr = $a1['curr']; $ship = $a1['ship']; if($curr=='EUR') $curr = chr(128); else if($curr=='USD' || $curr=='CAD') $curr = '$'; else if($curr=='GBP') $curr = '£'; diff --git a/version.json b/version.json index 0307314..7cfe99b 100755 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"1.1.3","host":"https://github.com/cmsunoPlugins/payment/"} +{"version":"1.2","host":"https://github.com/cmsunoPlugins/payment/"}