From 7cebe10e8d4055c6774b8b2dccafdab3955cc4ea Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Mon, 15 Nov 2021 10:55:24 +0800
Subject: [PATCH] * Product->Setting Language item modification.

---
 module/branch/view/batchedit.html.php | 6 +++---
 module/branch/view/create.html.php    | 6 +++---
 module/branch/view/edit.html.php      | 4 ++--
 module/branch/view/manage.html.php    | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/branch/view/batchedit.html.php b/module/branch/view/batchedit.html.php
index c1164f13e4..805cc4619e 100644
--- a/module/branch/view/batchedit.html.php
+++ b/module/branch/view/batchedit.html.php
@@ -21,8 +21,8 @@
       <thead>
         <tr>
           <th class='c-id'><?php echo $lang->branch->id;?></th>
-          <th class='required c-name'><?php echo $lang->branch->name;?></th>
-          <th class='c-desc'><?php echo $lang->branch->desc;?></th>
+          <th class='required c-name'><?php echo sprintf($lang->branch->name, $lang->product->branchName[$product->type]);?></th>
+          <th class='c-desc'><?php echo sprintf($lang->branch->desc, $lang->product->branchName[$product->type]);?></th>
           <th class='c-status'><?php echo $lang->branch->status;?></th>
           <th class='c-default text-center'><?php echo $lang->branch->defaultBranch;?></th>
         </tr>
@@ -31,7 +31,7 @@
         <?php foreach($branchList as $branch):?>
         <?php $disabled = $branch->id == BRANCH_MAIN ? 'disabled' : '';?>
         <tr>
-          <td><?php echo ($branch->id == BRANCH_MAIN ? '' : $branch->id) . html::hidden("IDList[$branch->id]", $branch);?></td>
+          <td><?php echo ($branch->id == BRANCH_MAIN ? '' : $branch->id) . html::hidden("IDList[$branch->id]", $branch->id);?></td>
           <td><?php echo html::input("name[$branch->id]", $branch->name,  "class='form-control chosen' $disabled");?></td>
           <td><?php echo html::input("desc[$branch->id]", $branch->desc, "class='form-control' $disabled");?></td>
           <td><?php echo html::select("status[$branch->id]", $lang->branch->statusList, $branch->status, "class='form-control' chosen $disabled onchange='canSetDefaultBranch(this)'");?></td>
diff --git a/module/branch/view/create.html.php b/module/branch/view/create.html.php
index db3a449ecc..899dc015ac 100644
--- a/module/branch/view/create.html.php
+++ b/module/branch/view/create.html.php
@@ -13,16 +13,16 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
-    <h2><?php echo $lang->branch->create;?></h2>
+    <h2><?php echo sprintf($lang->branch->create, $lang->product->branchName[$product->type]);?></h2>
   </div>
   <form class='main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th><?php echo $lang->branch->name;?></th>
+        <th><?php echo sprintf($lang->branch->name, $lang->product->branchName[$product->type]);?></th>
         <td><?php echo html::input('name', '', "class='form-control'");?></td>
       </tr>
       <tr>
-        <th><?php echo $lang->branch->desc;?></th>
+        <th><?php echo sprintf($lang->branch->desc, $lang->product->branchName[$product->type]);?></th>
         <td><?php echo html::input('desc', '', "class='form-control'");?></td>
       </tr>
       <tr>
diff --git a/module/branch/view/edit.html.php b/module/branch/view/edit.html.php
index ce23a1d75d..1ac717b388 100644
--- a/module/branch/view/edit.html.php
+++ b/module/branch/view/edit.html.php
@@ -18,7 +18,7 @@
   <form class='main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th><?php echo $lang->branch->name;?></th>
+        <th><?php echo sprintf($lang->branch->name, $lang->product->branchName[$product->type]);?></th>
         <td><?php echo html::input('name', $branch->name, "class='form-control'");?></td>
       </tr>
       <tr>
@@ -26,7 +26,7 @@
         <td><?php echo html::select('status', $lang->branch->statusList, $branch->status, "class='form-control chosen'");?></td>
       </tr>
       <tr>
-        <th><?php echo $lang->branch->desc;?></th>
+        <th><?php echo sprintf($lang->branch->desc, $lang->product->branchName[$product->type]);?></th>
         <td><?php echo html::input('desc', $branch->desc, "class='form-control'");?></td>
       </tr>
       <tr>
diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php
index 5871b4fc07..4f90fae36a 100644
--- a/module/branch/view/manage.html.php
+++ b/module/branch/view/manage.html.php
@@ -37,7 +37,7 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->branch->noData;?></span>
-      <?php if($canCreate) echo html::a($this->createLink('branch', 'create', "productID=$productID", '', true), "<i class='icon icon-plus'></i> " . $lang->branch->create, '', "class='btn btn-info iframe'");?>
+      <?php if($canCreate) echo html::a($this->createLink('branch', 'create', "productID=$productID", '', true), "<i class='icon icon-plus'></i> " . sprintf($lang->branch->create, $lang->product->branchName[$product->type]), '', "class='btn btn-info iframe'");?>
     </p>
   </div>
   <?php else:?>
@@ -99,7 +99,7 @@
           <td class='c-actions'>
           <?php
             $disabled = $isMain ? 'disabled' : '';
-            common::printIcon('branch', 'edit', "branchID=$branch->id", $branch, 'list', '', '', "$disabled iframe", true);
+            common::printIcon('branch', 'edit', "branchID=$branch->id&productID=$productID", $branch, 'list', '', '', "$disabled iframe", true);
             if($branch->status == 'active')
             {
                 common::printIcon('branch', 'close', "branchID=$branch->id", $branch, 'list', 'off', 'hiddenwin', $disabled);