From 679bc9f908b0a8bbcdad10b7dfeda87a0f2c7285 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 2 Nov 2023 20:47:13 +0100 Subject: [PATCH] fix saimod vendor template --- lib/system | 2 +- mojotrollz/api/api_mojotrollz.php | 4 ++-- .../saimod_mojotrollz_npc_vendor_template.php | 3 +-- .../tpl/npc_vendor_template.tpl | 4 ++-- .../tpl/npc_vendor_template_entry.tpl | 2 +- .../tpl/npc_vendor_template_vendor.tpl | 8 ++++---- .../tpl/npc_vendor_template_vendor_entry.tpl | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/system b/lib/system index 3a37b44..5a08816 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 3a37b44d341d67e598b9bbaedb83e8716f0b2aac +Subproject commit 5a08816550f7885a2c4ea4a691eee9cc112f15ea diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php index 5325030..23ec0eb 100644 --- a/mojotrollz/api/api_mojotrollz.php +++ b/mojotrollz/api/api_mojotrollz.php @@ -56,8 +56,8 @@ class api_mojotrollz extends \SYSTEM\API\api_system { return \SQL\MOJO_ACCOUNT_CHANGE_PASSWORD::QI(array($new_wow_password_sha1,$account,$old_wow_password_sha1,$email), new \SQL\mangos_realm()) ? JsonResult::ok() : JsonResult::fail();;} public static function call_tbc_action_item($id){ - return \JsonResult::toString(\SQL\TBC_ITEM::Q1(array($id),new \SQL\mangos_one_world()));} + return \JsonResult::toString(\SQL\TBC_ITEM::Q1(array($id),\SQL\mangos_one_world::connection()));} public static function call_tbc_action_itemextendedcost($id){ - return \JsonResult::toString(\SQL\TBC_ITEMEXTENDEDCOST::Q1(array($id),new \SQL\mangos_one_dbc()));} + return \JsonResult::toString(\SQL\TBC_ITEMEXTENDEDCOST::Q1(array($id),\SQL\mangos_one_dbc::connection()));} } \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php index 179761b..129290f 100644 --- a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php +++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php @@ -143,7 +143,6 @@ class saimod_mojotrollz_npc_vendor_template extends \SYSTEM\SAI\sai_module { public static function js(){return array( \LIB\lib_handlebars::js(), \LIB\lib_wow_tooltips::js(), new \PSAI('saimod_mojotrollz_npc_vendor_template/js/saimod_mojotrollz_npc_vendor_template.js'));} - //public static function css(){return array();} - public static function scss(){ + public static function css(){ return array( new \PSAI('saimod_mojotrollz_npc_vendor_template/css/default_item.scss'));} } \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template.tpl b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template.tpl index 1cd3043..93556f5 100644 --- a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template.tpl +++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template.tpl @@ -17,7 +17,7 @@ - + ${entries} @@ -30,7 +30,7 @@ - +