From 12fc686c004d19742ca1809dffd941897ff9f812 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 20 Mar 2019 11:42:15 +0100
Subject: [PATCH] FEAT #9107 admin shipping
---
src/core/lang/lang-en.php | 3 +++
src/core/lang/lang-fr.php | 3 +++
src/core/lang/lang-nl.php | 3 +++
.../shipping-administration.component.html | 16 +++-------------
.../shipping-administration.component.ts | 13 +++----------
src/frontend/lang/lang-en.ts | 2 +-
src/frontend/lang/lang-fr.ts | 4 ++--
src/frontend/lang/lang-nl.ts | 2 +-
.../app/shipping/ShippingControllerTest.php | 5 -----
9 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index d6e13c9cc72..7f0f381bdd4 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -470,3 +470,6 @@ define("_EMAIL_ERROR", "Error when sending");
define("_SHIPPING_ADDED", "Shipping added");
define("_SHIPPING_UPDATED", "Shipping updated");
define("_SHIPPING_DELETED", "Shipping deleted");
+
+define("_SHIPPINGS_ADMIN", "Shippings admin");
+define("_SHIPPINGS_ADMIN_DESC", "Configure mailing templates, for example for Maileva");
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index a8dc3d59413..3db09713615 100755
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -470,3 +470,6 @@ define("_EMAIL_ERROR", "Erreur lors de l'envoi");
define("_SHIPPING_ADDED", "Envoi postal ajouté");
define("_SHIPPING_UPDATED", "Envoi postal mis à jour");
define("_SHIPPING_DELETED", "Envoi postal supprimé");
+
+define("_SHIPPINGS_ADMIN", "Envois postaux");
+define("_SHIPPINGS_ADMIN_DESC", "Configurer les modèles d'envois postaux, par exemple pour Maileva");
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index 1951361612c..2ba68161702 100644
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -472,3 +472,6 @@ define("_EMAIL_ERROR", "Error when sending_TO_TRANSLATE");
define("_SHIPPING_ADDED", "Shipping added_TO_TRANSLATE");
define("_SHIPPING_UPDATED", "Shipping updated_TO_TRANSLATE");
define("_SHIPPING_DELETED", "Shipping deleted_TO_TRANSLATE");
+
+define("_SHIPPINGS_ADMIN", "Shippings admin_TO_TRANSLATE");
+define("_SHIPPINGS_ADMIN_DESC", "Configure mailing templates, for example for Maileva_TO_TRANSLATE");
diff --git a/src/frontend/app/administration/shipping/shipping-administration.component.html b/src/frontend/app/administration/shipping/shipping-administration.component.html
index 136157d8600..033870cf12a 100644
--- a/src/frontend/app/administration/shipping/shipping-administration.component.html
+++ b/src/frontend/app/administration/shipping/shipping-administration.component.html
@@ -52,18 +52,7 @@
</div>
</div>
<div class="form-group">
- <div class="formType ratio-2">
- <div class="formType-title">
- {{lang.envelopModes}}
- </div>
- <mat-radio-group class="radio-group" name="envelopMode" [(ngModel)]="shipping.options.envelopMode">
- <mat-radio-button *ngFor="let mode of envelopModes" name="{{mode}}" [value]="mode"
- color="primary">
- {{lang['shipping_'+mode]}}
- </mat-radio-button>
- </mat-radio-group>
- </div>
- <div class="formType ratio-1" style="flex-direction: column;">
+ <div class="formType ratio-2" style="flex-direction: column;">
<div class="formType-title">
{{lang.pricesInformations}}
</div>
@@ -104,11 +93,12 @@
{{lang.shipping_maxWeightInfo}}
</div>
</div>
+ <div class="formType ratio-1" style="border:0px"></div>
</div>
<div class="form-group">
<div class="formType ratio-1">
<div class="formType-title">
- Compte Maileva
+ {{lang.mailevaAccount}}
</div>
<div class="col-sm-6">
<mat-form-field>
diff --git a/src/frontend/app/administration/shipping/shipping-administration.component.ts b/src/frontend/app/administration/shipping/shipping-administration.component.ts
index 38f663035ae..5368f909a9f 100644
--- a/src/frontend/app/administration/shipping/shipping-administration.component.ts
+++ b/src/frontend/app/administration/shipping/shipping-administration.component.ts
@@ -32,7 +32,6 @@ export class ShippingAdministrationComponent implements OnInit {
description: '',
options: {
shapingOptions: [],
- envelopMode: 'small_simple',
sendMode: 'fast',
},
fee: {
@@ -57,17 +56,11 @@ export class ShippingAdministrationComponent implements OnInit {
'address_page',
];
- envelopModes: string[] = [
- 'small_simple',
- 'small_double',
- 'big_a4',
- ];
-
sendModes: string[] = [
'fast',
- 'economic',
- 'registered_mail',
- 'registered_mail_ar'
+ 'economic'
+ // 'registered_mail',
+ // 'registered_mail_ar'
];
hidePassword: boolean = true;
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index c918c8c6cbc..44444771134 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -899,7 +899,6 @@ export const LANG_EN = {
"shipping_maxWeightInfo" : "up to 20g",
"shapingOptions" : "Shapings options",
"sendModes" : "Send modes",
- "envelopModes" : "Envelop types",
"pricesInformations" : "Prices informations",
"shippingModification" : "Shipping modification",
"shippingCreation" : "Shipping creation",
@@ -907,4 +906,5 @@ export const LANG_EN = {
"shippingUpdated" : "Shipping updated",
"shippingDeleted" : "Shipping deleted",
"shippings" : "Shippings",
+ "mailevaAccount" : "Maileva account"
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 796d7d117f1..e5c5ce074dd 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -925,12 +925,12 @@ export const LANG_FR = {
"shipping_maxWeightInfo" : "Jusqu'Ã 20g",
"shapingOptions" : "Options de mise en page",
"sendModes" : "Modes d'envoi",
- "envelopModes" : "Types d'enveloppes",
"pricesInformations" : "Tarifs indicatifs",
"shippingModification" : "Modification du canal d'envoi",
"shippingCreation" : "Création du canal d'envoi",
"shippingAdded" : "Canal d'envoi ajouté",
"shippingUpdated" : "Canal d'envoi modifié",
"shippingDeleted" : "Canal d'envoi supprimé",
- "shippings" : "Canaux d'envoi",
+ "shippings" : "Envois postaux",
+ "mailevaAccount" : "Compte Maileva"
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 1873ab1dcbb..bf69aa05959 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -927,7 +927,6 @@ export const LANG_NL = {
"shipping_maxWeightInfo" : "up to 20g", //_TO_TRANSLATE
"shapingOptions" : "Shapings options", //_TO_TRANSLATE
"sendModes" : "Send modes", //_TO_TRANSLATE
- "envelopModes" : "Envelop types", //_TO_TRANSLATE
"pricesInformations" : "Prices informations", //_TO_TRANSLATE
"shippingModification" : "Shipping modification", //_TO_TRANSLATE
"shippingCreation" : "Shipping creation", //_TO_TRANSLATE
@@ -935,4 +934,5 @@ export const LANG_NL = {
"shippingUpdated" : "Shipping updated", //_TO_TRANSLATE
"shippingDeleted" : "Shipping deleted", //_TO_TRANSLATE
"shippings" : "Shippings", //_TO_TRANSLATE
+ "mailevaAccount" : "Maileva account" //_TO_TRANSLATE
};
diff --git a/test/unitTests/app/shipping/ShippingControllerTest.php b/test/unitTests/app/shipping/ShippingControllerTest.php
index d04d41b04f0..c150e3e187c 100755
--- a/test/unitTests/app/shipping/ShippingControllerTest.php
+++ b/test/unitTests/app/shipping/ShippingControllerTest.php
@@ -24,7 +24,6 @@ class ShippingControllerTest extends TestCase
'description' => 'description du TEST',
'options' => [
'shaping' => ['color', 'both_sides', 'address_page'],
- 'envelopMode' => 'small_simple',
'sendMode' => 'fast'
],
'fee' => ['first_page' => 1, 'next_page' => 2, 'postage_price' => 12],
@@ -44,7 +43,6 @@ class ShippingControllerTest extends TestCase
'description' => 'description du TEST',
'options' => [
'shaping' => ['color', 'both_sides', 'address_page'],
- 'envelopMode' => 'small_simple',
'sendMode' => 'fast'
],
'fee' => ['first_page' => 1, 'next_page' => 2, 'postage_price' => 12],
@@ -74,7 +72,6 @@ class ShippingControllerTest extends TestCase
$this->assertSame('color', $responseBody->shipping->options->shaping[0]);
$this->assertSame('both_sides', $responseBody->shipping->options->shaping[1]);
$this->assertSame('address_page', $responseBody->shipping->options->shaping[2]);
- $this->assertSame('small_simple', $responseBody->shipping->options->envelopMode);
$this->assertSame('fast', $responseBody->shipping->options->sendMode);
$this->assertSame(1, $responseBody->shipping->fee->first_page);
$this->assertSame(2, $responseBody->shipping->fee->next_page);
@@ -114,7 +111,6 @@ class ShippingControllerTest extends TestCase
'description' => 'description du test 2',
'options' => [
'shaping' => ['color', 'address_page'],
- 'envelopMode' => 'big_simple',
'sendMode' => 'fast'
],
'fee' => ['first_page' => 10, 'next_page' => 20, 'postage_price' => 12],
@@ -142,7 +138,6 @@ class ShippingControllerTest extends TestCase
$this->assertSame('description du test 2', $responseBody->shipping->description);
$this->assertSame('color', $responseBody->shipping->options->shaping[0]);
$this->assertSame('address_page', $responseBody->shipping->options->shaping[1]);
- $this->assertSame('big_simple', $responseBody->shipping->options->envelopMode);
$this->assertSame('fast', $responseBody->shipping->options->sendMode);
$this->assertSame(10, $responseBody->shipping->fee->first_page);
$this->assertSame(20, $responseBody->shipping->fee->next_page);
--
GitLab