Merge pull request 'initial branch inventory and stockin' (#14) from paulcortezl5 into main

Reviewed-on: #14

application/controllers/Pages.php

@@ -1371,7 +1371,7 @@ class Pages extends CI_controller
      * Branch Initial Inventory
     */
     
-    public function initialbranchinventory_()
+    public function initialbranchinventory()
     {
         if(!$this->isLogged())
             redirect('login', 'refresh');
@@ -1556,6 +1556,8 @@ class Pages extends CI_controller
         $this->load->model("StockIn");
         $this->load->model("BranchDeliveryView");
 
+        $data["allowStocInFromBranchDelivery"] = true;
+
         $data["htmlBrDeliveryList"] = '<tr><td colspan="5">No Record</td></tr>';
         
         $data["selectedDate"] = date('m/d/Y');
@@ -1570,8 +1572,11 @@ class Pages extends CI_controller
 
             $data["htmlBrDeliveryList"] = "";
             foreach($result->result() as $row)
+            {
+                if($row->modelno === "") $data["allowStocInFromBranchDelivery"] = false;
                 $data["htmlBrDeliveryList"] .= '<tr><td>'.$row->itemcode.'</td><td>'.$row->modelno.'</td><td>'.$row->catCode.'</td><td>'.number_format($row->brdsrp, 2).'</td><td>'.$row->qty.'</td></tr>';
             }
+        }
         else
             $data["drNo"] = 0;
             

application/views/pages/stockinnew.php

@@ -53,12 +53,16 @@
                         <tbody><?php echo $htmlBrDeliveryList; ?></tbody>
                       </table>
                     </div>
+
+                    <?php if(!$allowStocInFromBranchDelivery): ?>
+                      <p class="text-danger">Cannot add Stock In items. Please ask admin for synchronization.</p>
+                    <?php endif; ?>
                   </div>
                 </div>
               </div>
               <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button type="submit" class="btn btn-primary" <?php if($drNo == 0) echo "disabled"; ?>>Save Delivery Info as Stock In</button>
+                <button type="submit" class="btn btn-primary" <?php if($drNo == 0 || !$allowStocInFromBranchDelivery) echo "disabled"; ?>>Save Delivery Info as Stock In</button>
               </div>
             </form>
           </div>