diff --git a/Layout/default/Dashboard/Index.php b/Layout/default/Dashboard/Index.php index 1f71252e1..38cd090f4 100644 --- a/Layout/default/Dashboard/Index.php +++ b/Layout/default/Dashboard/Index.php @@ -10,8 +10,7 @@
  1. the-tool
    2. -
  2. Dashboard
    3. -
  3. Starter
    4. +
  4. Dashboard

Dashboard

diff --git a/Layout/default/Network/Index.php b/Layout/default/Network/Index.php index 19bec65c9..08969831f 100644 --- a/Layout/default/Network/Index.php +++ b/Layout/default/Network/Index.php @@ -133,6 +133,7 @@ + @@ -141,10 +142,11 @@ addresstypes as $address_id => $addresstypes): ?> + @@ -184,7 +186,7 @@
NameNetzeigentümer
getCompanyOrName()?>owner_id == $address_id) ? "checked='checked'" : ""?> disabled="disabled" /> $address_id, 'addresstype' => [$role]]) !== null): ?> - - $address_id])?>" class="text-danger" title="Löschen"> + $network->id, "address_id" => $address_id])?>" onclick="if(!confirm('Berechtigungen wirklich löschen?')) return false;" class="text-danger" title="Löschen">
- 1]) as $address): ?> addresstypes) && array_key_exists($address->id, $network->addresstypes)) continue; ?> diff --git a/Layout/default/Pop/Form.php b/Layout/default/Pop/Form.php index dfd5971e7..f28b12f4e 100644 --- a/Layout/default/Pop/Form.php +++ b/Layout/default/Pop/Form.php @@ -148,10 +148,10 @@ $(this).on('wheel.disableScroll', function (e) { e.preventDefault() }) - }) + }); $('form').on('blur', 'input[type=number]', function (e) { $(this).off('wheel.disableScroll') - }) + }); \ No newline at end of file diff --git a/Layout/default/Product/Form.php b/Layout/default/Product/Form.php new file mode 100644 index 000000000..eeda90436 --- /dev/null +++ b/Layout/default/Product/Form.php @@ -0,0 +1,235 @@ + + +
+
+ + +
+
+
+
+
    +
  1. ">the-tool
    2. +
  2. ">Produkte
    3. +
  3. id) ? "bearbeiten" : "Neu" ?>
    4. +
+
+

Produkte

+
+
+
+ + +
+
+ +
+
+

id) ? "Produkt bearbeiten" : "Neues Produkt"?>

+ +
"> +
+
+ + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + + +
+ +
+ +
+
+ + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ + +

Zusatzdaten

+
+
+
+ +
+ +
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+ +
+ +
+ +
+
+ + + +
+
+
+ +
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/Layout/default/Product/Index.php b/Layout/default/Product/Index.php new file mode 100644 index 000000000..dcf08ab7d --- /dev/null +++ b/Layout/default/Product/Index.php @@ -0,0 +1,69 @@ + + +
+
+ + +
+
+
+
+
    +
  1. ">the-tool
    2. +
  2. ">Produkte
    3. +
+
+

Produkte

+
+
+
+ + +
+
+ +
+
+
+

Liste aller Produkte

+
+
+ "> Neues Produkt anlegen +
+ + + + + + + + + + + + + + + + + + + + + + +
FremdproduktGruppeNameTechnologieVerkaufspreisVerr. Periode
external == 1) ? "" : ""?>productgroup->name?>name?>producttech->name?>price?>billing_period?>x Jährlich + $product->id])?>"> + $product->id])?>" class="text-danger" onclick="if(!confirm('Berechtigungen wirklich löschen?')) return false;" title="Produkt Löschen"> +
+
+
+ +
+
+ +
+
+ + + \ No newline at end of file diff --git a/Layout/default/footer.php b/Layout/default/footer.php index e9e847db0..bc40d9049 100644 --- a/Layout/default/footer.php +++ b/Layout/default/footer.php @@ -3,7 +3,7 @@
- the tool © 2021 Xinon GmbH - Made by fronk - Simulor Theme by Coderthemes + the tool © 2021 Xinon GmbH - Made by fronk
diff --git a/Layout/default/menu.php b/Layout/default/menu.php index 843670b2e..a0d431b15 100644 --- a/Layout/default/menu.php +++ b/Layout/default/menu.php @@ -7,11 +7,10 @@
  • ">Dashboard
    • -
  • Stammdaten
    -     +
    • - - diff --git a/application/Network/NetworkController.php b/application/Network/NetworkController.php index 2a1705e03..c38c152b1 100644 --- a/application/Network/NetworkController.php +++ b/application/Network/NetworkController.php @@ -56,7 +56,7 @@ class NetworkController extends mfBaseController { $mode = "edit"; $network = new Network($id); if(!$network->id) { - $this->layout()->setFlash("Netzgebie tnicht gefunden", "error"); + $this->layout()->setFlash("Netzgebiet nicht gefunden", "error"); $this->redirect("Network"); } } else { diff --git a/application/Network/NetworkModel.php b/application/Network/NetworkModel.php index eca10a807..ecf5e721c 100644 --- a/application/Network/NetworkModel.php +++ b/application/Network/NetworkModel.php @@ -20,6 +20,16 @@ class NetworkModel { } } + $me = new User(); + $me->loadMe(); + + if($model->create_by === null) { + $model->create_by = $me->id; + } + if($model->edit_by === null) { + $model->edit_by = $me->id; + } + return $model; } diff --git a/application/NetworkAddress/NetworkAddressController.php b/application/NetworkAddress/NetworkAddressController.php index 2477adfcd..14a25147d 100644 --- a/application/NetworkAddress/NetworkAddressController.php +++ b/application/NetworkAddress/NetworkAddressController.php @@ -100,4 +100,42 @@ class NetworkAddressController extends mfBaseController { $this->redirect("Network", "Index", [],"view=roles&net=$network_id"); } + + protected function deleteAction() { + $r = $this->request; + //var_dump($r->roles);exit; + if(!is_numeric($r->network_id) && $r->network_id <= 0) { + $this->layout()->setFlash("Netzgebiet nicht gefunden.", "error"); + $this->redirect("Network"); + } + if(!is_numeric($r->address_id) && $r->address_id <= 0) { + $this->layout()->setFlash("Person/Firma nicht gefunden.", "error"); + $this->redirect("Network"); + } + + $network_id = $r->network_id; + $address_id = $r->address_id; + + $network = new Network($network_id); + if(!$network->id) { + $this->layout()->setFlash("Netzgebiet nicht gefunden.", "error"); + $this->redirect("Network"); + } + + $address = new Address($address_id); + if(!$address->id) { + $this->layout()->setFlash("Person/Firma nicht gefunden.", "error"); + $this->redirect("Network", "Index", [], "view=roles&net=$network_id"); + } + + $roles = NetworkAddressModel::search(["network_id" => $network_id, "address_id" => $address_id]); + //var_dump($roles);exit; + + foreach($roles as $role) { + $role->delete(); + } + + $this->layout()->setFlash("Berechtigungen erfolgreich gelöscht.", "success"); + $this->redirect("Network", "Index", [], "view=roles&net=$network_id"); + } } \ No newline at end of file diff --git a/application/Product/Product.php b/application/Product/Product.php new file mode 100644 index 000000000..47391993f --- /dev/null +++ b/application/Product/Product.php @@ -0,0 +1,21 @@ +$name == null) { + + $classname = ucfirst($name); + $idfield = $name."_id"; + $this->$name = new $classname($this->$idfield); + + if($this->$name->id) { + return $this->$name; + } else { + return null; + } + } + } +} \ No newline at end of file diff --git a/application/Product/ProductController.php b/application/Product/ProductController.php new file mode 100644 index 000000000..18fdfa554 --- /dev/null +++ b/application/Product/ProductController.php @@ -0,0 +1,134 @@ +needlogin=true; + $me = new User(); + $me->loadMe(); + $this->me = $me; + $this->layout()->set("me",$me); + /* + if(!$me->isAdmin()) { + $this->redirect("Dashboard"); + }*/ + } + + protected function indexAction() { + $this->layout()->set("products", ProductModel::getAll()); + } + + protected function addAction() { + $this->layout()->setTemplate("Product/Form"); + $this->layout()->set("productgroups", ProductgroupModel::getAll()); + $this->layout()->set("producttechs", ProducttechModel::getAll()); + + } + + protected function editAction() { + $product_id = $this->request->id; + $product = new Product($product_id); + if(!$product->id) { + $this->layout()->setFlash("Produkt nicht gefunden.", "error"); + $this->redirect("Product"); + } + + $this->layout()->set("product", $product); + + return $this->addAction(); + } + + protected function saveAction() { + $r = $this->request; + //var_dump($r);exit; + $id = $r->id; + if(is_numeric($id) && $id > 0) { + $mode = "edit"; + $product = new Product($id); + if(!$product->id) { + $this->layout()->setFlash("Produkt nicht gefunden", "error"); + $this->redirect("Produkt"); + } + } else { + $id = false; + $mode = "add"; + } + + $data = []; + $data['name'] = $r->name; + $data['description'] = $r->description; + $data['external'] = ($r->external == 1) ? "1" : "0"; + $data['price_nne'] = Layout::commaToDot($r->price_nne); + $data['price_nbe'] = Layout::commaToDot($r->price_nbe); + $data['price'] = Layout::commaToDot($r->price); + $data['billing_period'] = $r->billing_period; + $data['note'] = $r->note; + + if(is_numeric($r->producttech_id)) { + $data['producttech_id'] = $r->producttech_id; + } + if(is_numeric($r->productgroup_id)) { + $data['productgroup_id'] = $r->productgroup_id; + } + + $data['edit_by'] = 1; + + if($mode == "add") { + $data['create_by'] = 1; + $product = ProductModel::create($data); + } else { + $product->update($data); + } + + //var_dump($address);exit; + + $new_id = $product->save(); + if(!$new_id) { + $this->layout()->setFlash("Fehler beim Speichern", "error"); + $this->layout()->set("product", $product); + return $this->add(); + } + + // create new product group and tech + + if($r->productgroup_id == "new") { + $ng = []; + $ng['name'] = $r->productgroup_new_name; + $ng['description'] = $r->productgroup_new_description; + $ng['note'] = $r->productgroup_new_note; + $group = ProductgroupModel::create($ng); + $group_id = $group->save(); + $product->productgroup_id = $group_id; + $product->save(); + } + + if($r->producttech_id == "new") { + $nt = []; + $nt['name'] = $r->producttech_new_name; + $nt['code'] = $r->producttech_new_code; + $nt['description'] = $r->producttech_new_description; + $nt['note'] = $r->producttech_new_note; + $tech = ProducttechModel::create($nt); + $tech_id = $tech->save(); + $product->producttech_id = $tech_id; + $product->save(); + } + + $this->layout()->setFlash("Produkt erfolgreich gespeichert.", "success"); + $this->redirect("Product", "Edit", ['id' => $new_id]); + } + + protected function delete() { + $id = $this->request->id; + + $product = new Product($id); + if(!$product->id || $product->id != $id) { + $this->layout()->setFlash("Produkt nicht gefunden.", "error"); + $this->redirect("Product"); + } + + // check if Product is unused + $product->delete(); + $this->redirect("Product"); + } +} \ No newline at end of file diff --git a/application/Product/ProductModel.php b/application/Product/ProductModel.php new file mode 100644 index 000000000..1882b431f --- /dev/null +++ b/application/Product/ProductModel.php @@ -0,0 +1,142 @@ + $value) { + if(property_exists(get_called_class(), $field)) { + $model ->$field = $value; + } + } + + $me = new User(); + $me->loadMe(); + + if($model->create_by === null) { + $model->create_by = $me->id; + } + if($model->edit_by === null) { + $model->edit_by = $me->id; + } + + return $model; + } + + public static function getOne($id) { + if(!is_numeric($id) || !$id) { + throw new Exception("Invalid number", 400); + } + $item = []; + $db = FronkDB::singleton(); + + $res = $db->select("Product", "*", "id=$id LIMIT 1"); + if($db->num_rows($res)) { + $data = $db->fetch_object($res); + $item = new Product($data); + } + return $item; + } + + public static function getAll() { + $items = []; + + $db = FronkDB::singleton(); + + $res = $db->select("Product", "*", "1 = 1 ORDER BY producttech_id, name"); + if($db->num_rows($res)) { + while($data = $db->fetch_object($res)) { + $items[] = new Product($data); + } + } + return $items; + + } + + public static function getFirst() { + $db = FronkDB::singleton(); + + $where = self::getSqlFilter($filter); + $res = $db->select("Product", "*", "$where ORDER BY producttech_id, name LIMIT 1"); + if($db->num_rows($res)) { + $data = $db->fetch_object($res); + $item = new Product($data); + if($item->id) { + return $item; + } else { + return null; + } + } + return null; + } + + public static function search($filter) { + $items = []; + $db = FronkDB::singleton(); + + $where = self::getSqlFilter($filter); + $res = $db->select("Product", "*", "$where ORDER BY name, owner_id"); + if($db->num_rows($res)) { + while($data = $db->fetch_object($res)) { + $items[] = new Product($data); + } + } + return $items; + } + + private function getSqlFilter($filter) { + $where = "1=1 "; + + $db = FronkDB::singleton(); + + //var_dump($filter);exit; + if(array_key_exists("productgroup_id", $filter)) { + $productgroup_id = $filter['productgroup_id']; + if(is_numeric($productgroup_id)) { + $where .= " AND productgroup_id=$productgroup_id"; + } + } + + if(array_key_exists("producttech_id", $filter)) { + $producttech_id = $filter['producttech_id']; + if(is_numeric($producttech_id)) { + $where .= " AND producttech_id=$producttech_id"; + } + } + + if(array_key_exists("name", $filter)) { + $name = $db->escape($filter['name']); + if($name) { + $where .= " AND `name` like '$name'"; + } + } + + if(array_key_exists("nameLike", $filter)) { + $name = $db->escape($filter['nameLike']); + if($name) { + $where .= " AND `name` like '%$name%'"; + } + } + + //var_dump($filter, $where);exit; + return $where; + } + +} \ No newline at end of file diff --git a/application/Productgroup/Productgroup.php b/application/Productgroup/Productgroup.php new file mode 100644 index 000000000..7263f6835 --- /dev/null +++ b/application/Productgroup/Productgroup.php @@ -0,0 +1,5 @@ +needlogin=true; + $me = new User(); + $me->loadMe(); + $this->me = $me; + $this->layout()->set("me",$me); + /* + if(!$me->isAdmin()) { + $this->redirect("Dashboard"); + }*/ + } + + protected function indexAction() { + + } + + protected function addAction() { + + } + + protected function editAction() { + + } + + +} \ No newline at end of file diff --git a/application/Productgroup/ProductgroupModel.php b/application/Productgroup/ProductgroupModel.php new file mode 100644 index 000000000..67bbcd7dd --- /dev/null +++ b/application/Productgroup/ProductgroupModel.php @@ -0,0 +1,122 @@ + $value) { + if(property_exists(get_called_class(), $field)) { + $model ->$field = $value; + } + } + + $me = new User(); + $me->loadMe(); + + if($model->create_by === null) { + $model->create_by = $me->id; + } + if($model->edit_by === null) { + $model->edit_by = $me->id; + } + + return $model; + } + + public static function getOne($id) { + if(!is_numeric($id) || !$id) { + throw new Exception("Invalid number", 400); + } + $item = []; + $db = FronkDB::singleton(); + + $res = $db->select("Productgroup", "*", "id=$id LIMIT 1"); + if($db->num_rows($res)) { + $data = $db->fetch_object($res); + $item = new Productgroup($data); + } + return $item; + } + + public static function getAll() { + $items = []; + + $db = FronkDB::singleton(); + + $res = $db->select("Productgroup", "*", "1 = 1 ORDER BY name"); + if($db->num_rows($res)) { + while($data = $db->fetch_object($res)) { + $items[$data->id] = new Productgroup($data); + } + } + return $items; + + } + + public static function getFirst() { + $db = FronkDB::singleton(); + + $where = self::getSqlFilter($filter); + $res = $db->select("Productgroup", "*", "$where ORDER BY name"); + if($db->num_rows($res)) { + $data = $db->fetch_object($res); + $item = new Productgroup($data); + if($item->id) { + return $item; + } else { + return null; + } + } + return null; + } + + public static function search($filter) { + $items = []; + $db = FronkDB::singleton(); + + $where = self::getSqlFilter($filter); + $res = $db->select("Productgroup", "*", "$where ORDER BY name"); + if($db->num_rows($res)) { + while($data = $db->fetch_object($res)) { + $items[$data->id] = new Productgroup($data); + } + } + return $items; + } + + private function getSqlFilter($filter) { + $where = "1=1 "; + + $db = FronkDB::singleton(); + + //var_dump($filter);exit; + if(array_key_exists("name", $filter)) { + $name = $db->escape($filter['name']); + if($name) { + $where .= " AND `name` like '$name'"; + } + } + + if(array_key_exists("nameLike", $filter)) { + $name = $db->escape($filter['nameLike']); + if($name) { + $where .= " AND `name` like '%$name%'"; + } + } + + //var_dump($filter, $where);exit; + return $where; + } + +} \ No newline at end of file diff --git a/application/Producttech/Producttech.php b/application/Producttech/Producttech.php new file mode 100644 index 000000000..3ba28e7e0 --- /dev/null +++ b/application/Producttech/Producttech.php @@ -0,0 +1,5 @@ + $value) { + if(property_exists(get_called_class(), $field)) { + $model->$field = $value; + } + } + + $me = new User(); + $me->loadMe(); + + if($model->create_by === null) { + $model->create_by = $me->id; + } + if($model->edit_by === null) { + $model->edit_by = $me->id; + } + + return $model; + } + + public static function getOne($id) { + if(!is_numeric($id) || !$id) { + throw new Exception("Invalid number", 400); + } + $item = []; + $db = FronkDB::singleton(); + + $res = $db->select("Producttech", "*", "id=$id LIMIT 1"); + if($db->num_rows($res)) { + $data = $db->fetch_object($res); + $item = new Producttech($data); + } + return $item; + } + + public static function getAll() { + $items = []; + + $db = FronkDB::singleton(); + + $res = $db->select("Producttech", "*", "1 = 1 ORDER BY name"); + if($db->num_rows($res)) { + while($data = $db->fetch_object($res)) { + $items[$data->id] = new Producttech($data); + } + } + return $items; + + } + + public static function getFirst() { + $db = FronkDB::singleton(); + + $where = self::getSqlFilter($filter); + $res = $db->select("Producttech", "*", "$where ORDER BY name"); + if($db->num_rows($res)) { + $data = $db->fetch_object($res); + $item = new Producttech($data); + if($item->id) { + return $item; + } else { + return null; + } + } + return null; + } + + public static function search($filter) { + $items = []; + $db = FronkDB::singleton(); + + $where = self::getSqlFilter($filter); + $res = $db->select("Producttech", "*", "$where ORDER BY name"); + if($db->num_rows($res)) { + while($data = $db->fetch_object($res)) { + $items[$data->id] = new Producttech($data); + } + } + return $items; + } + + private function getSqlFilter($filter) { + $where = "1=1 "; + + $db = FronkDB::singleton(); + + //var_dump($filter);exit; + if(array_key_exists("name", $filter)) { + $name = $db->escape($filter['name']); + if($name) { + $where .= " AND `name` like '$name'"; + } + } + + if(array_key_exists("nameLike", $filter)) { + $name = $db->escape($filter['nameLike']); + if($name) { + $where .= " AND `name` like '%$name%'"; + } + } + + if(array_key_exists("code", $filter)) { + $code = $db->escape($filter['code']); + if($code) { + $where .= " AND `code` like '$code'"; + } + } + + //var_dump($filter, $where);exit; + return $where; + } + +} \ No newline at end of file diff --git a/contrib/migrations/20210629-01-addresstype-planner-vlan.sql b/contrib/migrations/20210629-addresstype-planner-vlan.sql similarity index 100% rename from contrib/migrations/20210629-01-addresstype-planner-vlan.sql rename to contrib/migrations/20210629-addresstype-planner-vlan.sql diff --git a/contrib/migrations/20210705-product-tables.sql b/contrib/migrations/20210705-product-tables.sql new file mode 100644 index 000000000..2c97abf47 --- /dev/null +++ b/contrib/migrations/20210705-product-tables.sql @@ -0,0 +1,83 @@ +CREATE TABLE `Product` ( + `id` int NOT NULL AUTO_INCREMENT, + `name` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci NOT NULL, + `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci, + `external` tinyint(1) NOT NULL DEFAULT '0', + `producttech_id` int DEFAULT NULL, + `productgroup_id` int DEFAULT NULL, + `price_nne` decimal(12,2) DEFAULT NULL, + `price_nbe` decimal(12,2) DEFAULT NULL, + `price` decimal(12,2) NOT NULL, + `billing_period` int NOT NULL COMMENT 'in months', + `note` text COLLATE utf8mb4_unicode_520_ci, + `create_by` int NOT NULL, + `edit_by` int NOT NULL, + `create` int NOT NULL, + `edit` int NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci + +CREATE TABLE `ProductNetwork` ( + `id` int NOT NULL AUTO_INCREMENT, + `product_id` int NOT NULL, + `network_id` int NOT NULL, + `create_by` int NOT NULL, + `edit_by` int NOT NULL, + `create` int NOT NULL, + `edit` int NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci + +CREATE TABLE `Productattribute` ( + `id` int NOT NULL AUTO_INCREMENT, + `product_id` int NOT NULL, + `producttechattribute_id` int NOT NULL, + `name` varchar(1024) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `displayname` varchar(1024) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `value` varchar(1024) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `description` text COLLATE utf8mb4_unicode_520_ci NOT NULL, + `note` text COLLATE utf8mb4_unicode_520_ci NOT NULL, + `create_by` int NOT NULL, + `edit_by` int NOT NULL, + `create` int NOT NULL, + `edit` int NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci + +CREATE TABLE `Productgroup` ( + `id` int NOT NULL AUTO_INCREMENT, + `name` varchar(1024) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `description` text COLLATE utf8mb4_unicode_520_ci NOT NULL, + `note` text COLLATE utf8mb4_unicode_520_ci NOT NULL, + `create_by` int NOT NULL, + `edit_by` int NOT NULL, + `create` int NOT NULL, + `edit` int NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci + +CREATE TABLE `Producttech` ( + `id` int NOT NULL AUTO_INCREMENT, + `name` varchar(1024) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `code` varchar(255) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `description` text COLLATE utf8mb4_unicode_520_ci NOT NULL, + `note` text COLLATE utf8mb4_unicode_520_ci NOT NULL, + `create_by` int NOT NULL, + `edit_by` int NOT NULL, + `create` int NOT NULL, + `edit` int NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci + +CREATE TABLE `ProducttechAttribute` ( + `id` int NOT NULL, + `name` varchar(1024) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `displayname` varchar(1024) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `value` varchar(1024) COLLATE utf8mb4_unicode_520_ci NOT NULL, + `description` text COLLATE utf8mb4_unicode_520_ci NOT NULL, + `note` text COLLATE utf8mb4_unicode_520_ci NOT NULL, + `create_by` int NOT NULL, + `edit_by` int NOT NULL, + `create` int NOT NULL, + `edit` int NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci diff --git a/lib/Layout/Layout.php b/lib/Layout/Layout.php index 37273e420..22907296f 100644 --- a/lib/Layout/Layout.php +++ b/lib/Layout/Layout.php @@ -19,4 +19,8 @@ class Layout extends mfLayout { public function dotToComma($num) { return str_replace(".", ",", $num); } + + public function commaToDot($num) { + return str_replace(",", ".", $num); + } } \ No newline at end of file