From 6b1762fef3f6c2f73c61b9971464b284a5ee1e79 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 20 Mar 2019 18:03:20 +0100
Subject: [PATCH] FIX shipping_templates table
---
sql/develop.sql | 8 ++++----
sql/structure.sql | 8 ++++----
src/app/shipping/controllers/ShippingController.php | 6 +++---
src/app/shipping/models/ShippingModelAbstract.php | 12 ++++++------
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/sql/develop.sql b/sql/develop.sql
index f229bfaacde..4efb26a7d3e 100755
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -80,9 +80,9 @@ CONSTRAINT emails_pkey PRIMARY KEY (id)
)
WITH (OIDS=FALSE);
-/* SHIPPINGS */
-DROP TABLE IF EXISTS shippings;
-CREATE TABLE shippings
+/* SHIPPING TEMPLATES */
+DROP TABLE IF EXISTS shipping_templates;
+CREATE TABLE shipping_templates
(
id serial NOT NULL,
label character varying(64) NOT NULL,
@@ -91,7 +91,7 @@ options json DEFAULT '{}',
fee json DEFAULT '{}',
entities json DEFAULT '{}',
account json DEFAULT '{}',
-CONSTRAINT shippings_pkey PRIMARY KEY (id)
+CONSTRAINT shipping_templates_pkey PRIMARY KEY (id)
)
WITH (OIDS=FALSE);
diff --git a/sql/structure.sql b/sql/structure.sql
index df1b14a5664..06e24d684d5 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -1566,9 +1566,9 @@ process_comment character varying(255),
CONSTRAINT listinstance_history_details_pkey PRIMARY KEY (listinstance_history_details_id)
) WITH ( OIDS=FALSE );
-/* SHIPPINGS */
-DROP TABLE IF EXISTS shippings;
-CREATE TABLE shippings
+/* SHIPPING TEMPLATES */
+DROP TABLE IF EXISTS shipping_templates;
+CREATE TABLE shipping_templates
(
id serial NOT NULL,
label character varying(64) NOT NULL,
@@ -1577,7 +1577,7 @@ options json DEFAULT '{}',
fee json DEFAULT '{}',
entities json DEFAULT '{}',
account json DEFAULT '{}',
-CONSTRAINT shippings_pkey PRIMARY KEY (id)
+CONSTRAINT shipping_templates_pkey PRIMARY KEY (id)
)
WITH (OIDS=FALSE);
diff --git a/src/app/shipping/controllers/ShippingController.php b/src/app/shipping/controllers/ShippingController.php
index 3c7593dba15..6da8097d0c0 100755
--- a/src/app/shipping/controllers/ShippingController.php
+++ b/src/app/shipping/controllers/ShippingController.php
@@ -107,7 +107,7 @@ class ShippingController
$id = ShippingModel::create($body);
HistoryController::add([
- 'tableName' => 'shippings',
+ 'tableName' => 'shipping_templates',
'recordId' => $id,
'eventType' => 'ADD',
'eventId' => 'shippingadd',
@@ -146,7 +146,7 @@ class ShippingController
ShippingModel::update($body);
HistoryController::add([
- 'tableName' => 'shippings',
+ 'tableName' => 'shipping_templates',
'recordId' => $aArgs['id'],
'eventType' => 'UP',
'eventId' => 'shippingup',
@@ -174,7 +174,7 @@ class ShippingController
ShippingModel::delete(['id' => $aArgs['id']]);
HistoryController::add([
- 'tableName' => 'shippings',
+ 'tableName' => 'shipping_templates',
'recordId' => $aArgs['id'],
'eventType' => 'DEL',
'eventId' => 'shippingdel',
diff --git a/src/app/shipping/models/ShippingModelAbstract.php b/src/app/shipping/models/ShippingModelAbstract.php
index 9e52a20a82f..0b088a77efc 100755
--- a/src/app/shipping/models/ShippingModelAbstract.php
+++ b/src/app/shipping/models/ShippingModelAbstract.php
@@ -26,7 +26,7 @@ abstract class ShippingModelAbstract
$shippings = DatabaseModel::select([
'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['shippings'],
+ 'table' => ['shipping_templates'],
'where' => empty($aArgs['where']) ? [] : $aArgs['where'],
'data' => empty($aArgs['data']) ? [] : $aArgs['data'],
'order_by' => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
@@ -44,7 +44,7 @@ abstract class ShippingModelAbstract
$shipping = DatabaseModel::select([
'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['shippings'],
+ 'table' => ['shipping_templates'],
'where' => ['id = ?'],
'data' => [$aArgs['id']]
]);
@@ -58,11 +58,11 @@ abstract class ShippingModelAbstract
public static function create(array $aArgs)
{
- $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'shippings_id_seq']);
+ $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'shipping_templates_id_seq']);
$aArgs['id'] = $nextSequenceId;
DatabaseModel::insert([
- 'table' => 'shippings',
+ 'table' => 'shipping_templates',
'columnsValues' => $aArgs
]);
@@ -75,7 +75,7 @@ abstract class ShippingModelAbstract
ValidatorModel::intVal($aArgs, ['id']);
DatabaseModel::update([
- 'table' => 'shippings',
+ 'table' => 'shipping_templates',
'set' => [
'label' => $aArgs['label'],
'description' => $aArgs['description'],
@@ -97,7 +97,7 @@ abstract class ShippingModelAbstract
ValidatorModel::intVal($aArgs, ['id']);
DatabaseModel::delete([
- 'table' => 'shippings',
+ 'table' => 'shipping_templates',
'where' => ['id = ?'],
'data' => [$aArgs['id']]
]);
--
GitLab