From 9f22216e52d683fa47b3bb31ddaf70bdad8ceba3 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 22 Mar 2019 15:56:15 +0100
Subject: [PATCH] Rename shippingTemplate
---
.../ShippingTemplateController.php | 28 +++++++++----------
.../shipping/models/ShippingTemplateModel.php | 4 +--
.../models/ShippingTemplateModelAbstract.php | 4 +--
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/app/shipping/controllers/ShippingTemplateController.php b/src/app/shipping/controllers/ShippingTemplateController.php
index a955227f9f4..17be6aecdfa 100755
--- a/src/app/shipping/controllers/ShippingTemplateController.php
+++ b/src/app/shipping/controllers/ShippingTemplateController.php
@@ -5,7 +5,7 @@
* See LICENCE.txt file at the root folder for more details.
* This file is part of Maarch software.
-* @brief ShippingController
+* @brief ShippingTemplateController
* @author dev <dev@maarch.org>
* @ingroup core
*/
@@ -16,12 +16,12 @@ use Entity\models\EntityModel;
use Group\models\ServiceModel;
use History\controllers\HistoryController;
use Respect\Validation\Validator;
-use Shipping\models\ShippingModel;
+use Shipping\models\ShippingTemplateModel;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\models\PasswordModel;
-class ShippingController
+class ShippingTemplateController
{
public function get(Request $request, Response $response)
{
@@ -29,7 +29,7 @@ class ShippingController
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
- return $response->withJson(['shippings' => ShippingModel::get(['id', 'label', 'description', 'options', 'fee', 'entities'])]);
+ return $response->withJson(['shippings' => ShippingTemplateModel::get(['id', 'label', 'description', 'options', 'fee', 'entities'])]);
}
public function getById(Request $request, Response $response, array $aArgs)
@@ -42,7 +42,7 @@ class ShippingController
return $response->withStatus(400)->withJson(['errors' => 'id is not an integer']);
}
- $shippingInfo = ShippingModel::getById(['id' => $aArgs['id']]);
+ $shippingInfo = ShippingTemplateModel::getById(['id' => $aArgs['id']]);
if (empty($shippingInfo)) {
return $response->withStatus(400)->withJson(['errors' => 'Shipping does not exist']);
}
@@ -91,7 +91,7 @@ class ShippingController
$body = $request->getParsedBody();
- $errors = ShippingController::checkData($body, 'create');
+ $errors = ShippingTemplateController::checkData($body, 'create');
if (!empty($errors)) {
return $response->withStatus(400)->withJson(['errors' => $errors]);
}
@@ -105,7 +105,7 @@ class ShippingController
$body['entities'] = json_encode($body['entities']);
$body['account'] = json_encode($body['account']);
- $id = ShippingModel::create([
+ $id = ShippingTemplateModel::create([
'label' => $body['label'],
'description' => $body['description'],
'options' => $body['options'],
@@ -134,7 +134,7 @@ class ShippingController
$body = $request->getParsedBody();
$body['id'] = $aArgs['id'];
- $errors = ShippingController::checkData($body, 'update');
+ $errors = ShippingTemplateController::checkData($body, 'update');
if (!empty($errors)) {
return $response->withStatus(500)->withJson(['errors' => $errors]);
}
@@ -142,7 +142,7 @@ class ShippingController
if (!empty($body['account']['password'])) {
$body['account']['password'] = PasswordModel::encrypt(['password' => $body['account']['password']]);
} else {
- $shippingInfo = ShippingModel::getById(['id' => $aArgs['id'], 'select' => ['account']]);
+ $shippingInfo = ShippingTemplateModel::getById(['id' => $aArgs['id'], 'select' => ['account']]);
$body['account']['password'] = $shippingInfo['account']->password;
}
@@ -151,7 +151,7 @@ class ShippingController
$body['entities'] = json_encode($body['entities']);
$body['account'] = json_encode($body['account']);
- ShippingModel::update($body);
+ ShippingTemplateModel::update($body);
HistoryController::add([
'tableName' => 'shipping_templates',
@@ -174,12 +174,12 @@ class ShippingController
return $response->withStatus(400)->withJson(['errors' => 'id is not an integer']);
}
- $shippingInfo = ShippingModel::getById(['id' => $aArgs['id'], 'select' => ['label']]);
+ $shippingInfo = ShippingTemplateModel::getById(['id' => $aArgs['id'], 'select' => ['label']]);
if (empty($shippingInfo)) {
return $response->withStatus(400)->withJson(['errors' => 'Shipping does not exist']);
}
- ShippingModel::delete(['id' => $aArgs['id']]);
+ ShippingTemplateModel::delete(['id' => $aArgs['id']]);
HistoryController::add([
'tableName' => 'shipping_templates',
@@ -189,7 +189,7 @@ class ShippingController
'info' => _SHIPPING_DELETED. ' : ' . $shippingInfo['label']
]);
- $shippings = ShippingModel::get(['select' => ['id', 'label', 'description', 'options', 'fee', 'entities']]);
+ $shippings = ShippingTemplateModel::get(['select' => ['id', 'label', 'description', 'options', 'fee', 'entities']]);
return $response->withJson(['shippings' => $shippings]);
}
@@ -201,7 +201,7 @@ class ShippingController
if (!Validator::intVal()->validate($aArgs['id'])) {
$errors[] = 'Id is not a numeric';
} else {
- $shippingInfo = ShippingModel::getById(['id' => $aArgs['id']]);
+ $shippingInfo = ShippingTemplateModel::getById(['id' => $aArgs['id']]);
}
if (empty($shippingInfo)) {
$errors[] = 'Shipping does not exist';
diff --git a/src/app/shipping/models/ShippingTemplateModel.php b/src/app/shipping/models/ShippingTemplateModel.php
index d0b3feca7a1..e30a1781465 100755
--- a/src/app/shipping/models/ShippingTemplateModel.php
+++ b/src/app/shipping/models/ShippingTemplateModel.php
@@ -8,14 +8,14 @@
*/
/**
-* @brief Shipping Model
+* @brief Shipping Template Model
* @author dev@maarch.org
* @ingroup core
*/
namespace Shipping\models;
-class ShippingModel extends ShippingModelAbstract
+class ShippingTemplateModel extends ShippingTemplateModelAbstract
{
// Do your stuff in this class
}
diff --git a/src/app/shipping/models/ShippingTemplateModelAbstract.php b/src/app/shipping/models/ShippingTemplateModelAbstract.php
index ff6c4cb1493..26b965e30e2 100755
--- a/src/app/shipping/models/ShippingTemplateModelAbstract.php
+++ b/src/app/shipping/models/ShippingTemplateModelAbstract.php
@@ -8,7 +8,7 @@
*/
/**
-* @brief Shipping Model Abstract
+* @brief Shipping Template Model Abstract
* @author dev@maarch.org
*/
@@ -17,7 +17,7 @@ namespace Shipping\models;
use SrcCore\models\ValidatorModel;
use SrcCore\models\DatabaseModel;
-abstract class ShippingModelAbstract
+abstract class ShippingTemplateModelAbstract
{
public static function get(array $aArgs = [])
{
--
GitLab