cief/ARCHIVED-IZYIM
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/ARCHIVED-IZYIM.git synced 2026-08-19 04:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Asif/fixing_bugs' into 'master'

Browse Source 
Asif/fixing bugs

See merge request CIEFWorldwideSdnBhd/IZYIM!3
This commit is contained in:
Jack Goh
2018-04-03 02:46:36 +00:00
parent ede08216a6 c4219ca644
commit 84ad0e057f
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/modul-js/orders/shipping-order/create.js
+11 -2
View File
@@ -171,7 +171,15 @@ var TableDatatablesEditable = function() {
},
packaging_quantity: {
required: true,
},
packaging_type1:{
required: true,
},
total_cartons:{
required: true,
},
messages: {
description: {
@@ -180,6 +188,7 @@ var TableDatatablesEditable = function() {
packaging_quantity: {
required: "You must choose package quantity to proceed",
},
},
@@ -212,7 +221,7 @@ var TableDatatablesEditable = function() {
.addClass('valid') // mark the current input as valid and display OK icon
.closest('.form-group').removeClass('has-error').addClass('has-success'); // set success class to the control group
}
}
}}
});
success.hide();
error.hide();
modul/arrangements/shipment/init.php
+1 -1
View File
@@ -32,7 +32,7 @@ function create_shipment_arrangement_js() {
<script src="/assets/global/plugins/bootstrap-timepicker/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/clockface/js/clockface.js" type="text/javascript"></script>
<script src="/assets/modul-js/arrangements/shipment-arrangement/create.min.js" type="text/javascript"></script>
<script src="/assets/modul-js/arrangements/shipment-arrangement/create.js" type="text/javascript"></script>
<?php
}
modul/arrangements/warehouse/init.php
+3
View File
@@ -214,6 +214,9 @@ function the_warehouse_arrangement(){
$db->bind("so_item_id", $warehouse_arrangement_item['so_item_id']);
$db->bind("warehouse_arrangement_id", $warehouse_arrangement_id);
$warehouse_arrangement_itemsCreate = $db->query("INSERT INTO warehouse_arrangement_items (actual_ctn, actual_measurement_ctn, actual_weight_ctn, actual_height_ctn, actual_width_ctn, actual_depth_ctn, status, isDamaged, image, so_item_id, warehouse_arrangement_id) VALUES (:actual_ctn, :actual_measurement_ctn, :actual_weight_ctn, :actual_height_ctn, :actual_width_ctn, :actual_depth_ctn, :status, :isDamaged, :image, :so_item_id, :warehouse_arrangement_id);");
if($warehouse_arrangement_item['status'] == 1 || $warehouse_arrangement_item['isDamaged'] == 1){
modul/orders/shipping-order/create.tpl.php
+9 -1
View File
@@ -368,8 +368,15 @@
<input type="number" name="packaging_quantity" id="packaging_quantity" placeholder="30" class="form-control int" required>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Total Cartons<span class="required"> * </span>
</label>
<div class="col-md-4">
<input type="number" name="total_cartons" id="total_cartoons" placeholder="30" class="form-control int" required>
</div>
</div>
<div class="form-group" id="pack_type">
<label class="control-label col-md-3">Packaging Type</label>
<label class="control-label col-md-3">Packaging Type<span class="required"> * </span></label>
<div class="col-md-6">
<select name="packaging_type1" id="packaging_type1" class="form-control">
<option value="">Please choose Packaging Type</option>
@@ -379,6 +386,7 @@
<option value="Sacks">Sacks</option>
<option value="new">Add New</option>
</select>
</div>
</div>
<div class="form-group" id="pack_type_uom">
modul/orders/shipping-order/init.php
+3 -2
View File
@@ -36,7 +36,7 @@ function create_so_js() {
<script src="/assets/global/scripts/datatable.js" type="text/javascript"></script>
<script src="/assets/global/plugins/datatables/datatables.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.js" type="text/javascript"></script>
<script src="/assets/modul-js/orders/shipping-order/create.min.js?v=<?php echo rand(); ?>" type="text/javascript"></script>
<script src="/assets/modul-js/orders/shipping-order/create.js?v=<?php echo rand(); ?>" type="text/javascript"></script>
<?php
}
function so_js() {
@@ -328,6 +328,7 @@ function the_so(){
$db->bind("item_code", $shippingorderitem['item_code']);
$db->bind("uom", $shippingorderitem['uom']);
$db->bind("quantity", $shippingorderitem['quantity']);
$db->bind("total_cartons", $shippingorderitem['total_cartons']);
$db->bind("packaging_quantity", $shippingorderitem['packaging_quantity']);
$db->bind("packaging_cbm", $shippingorderitem['packaging_cbm']);
if($shippingorderitem['packaging_type1'] == "new"){
@@ -346,7 +347,7 @@ function the_so(){
$db->bind("image4", ($shippingorderitem['image4'] <> "" ? $shippingorderitem['image4'] : NULL));
$db->bind("so_id", $so_id);
$soItemCreate = $db->query("INSERT INTO shipping_order_items ( item_code, model_no, brand_no, description, quantity, uom, packaging_quantity, packaging_type, packaging_cbm, packaging_height, packaging_width, packaging_depth, packaging_gross, packaging_nett, image, image2, image3, image4, so_id) VALUES (:item_code, :model_no, :brand_no, :description, :quantity, :uom, :packaging_quantity, :packaging_type, :packaging_cbm, :packaging_height, :packaging_width, :packaging_depth, :packaging_gross, :packaging_nett, :image, :image2, :image3, :image4, :so_id);");
$soItemCreate = $db->query("INSERT INTO shipping_order_items ( item_code, model_no, brand_no, description, quantity, uom, packaging_quantity,total_cartons, packaging_type, packaging_cbm, packaging_height, packaging_width, packaging_depth, packaging_gross, packaging_nett, image, image2, image3, image4, so_id) VALUES (:item_code, :model_no, :brand_no, :description, :quantity, :uom, :packaging_quantity,:total_cartons, :packaging_type, :packaging_cbm, :packaging_height, :packaging_width, :packaging_depth, :packaging_gross, :packaging_nett, :image, :image2, :image3, :image4, :so_id);");
}
}