diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index 72b9f3ca..440ef89b 100644 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -458,6 +458,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, function getRawPOMaterialList($ReqNo, $IsArray = '') { + $result = $this->db->query("CALL P_GET_REQUISTIONLIST('" . $ReqNo . "')"); // or die(mysql_error()); // $result ->next_result(); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index a5b60ad3..0da895d5 100644 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -718,6 +718,28 @@ if (!empty($getlogpodtl)) { .num { text-align: right; } + .header-container { + display: flex; + justify-content: space-between; + align-items: center; + padding: 25px; + } + + .header-container h2 { + flex: 1; + text-align: center; + margin: 0; + } + .centered { + display: flex; + /* justify-content: center; */ + align-items: center; + height: 10vh; + } + .centered label, .centered input { + margin: 0 5px; + } + .mandatory { color:red;text-align:right;background-color: white;}
-
+
-

Edit Service Purchase Order-

+

Edit Service Purchase Order-

-

Amended Service Purchase Order-

+

Amended Service Purchase Order-

+ Back
-
-
-
-
- - - - 'Selected Requisition Numbers'); - if (!empty($ReqList)) { - foreach ($ReqList as $SID) : - - $options[$SID->ReqNo] = $SID->ReqNo; - endforeach; - } - echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"'); - - ?> -
-
- -
+
+
+
+ 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); - echo form_input($data); - ?> -
-
+ $options = array("0" => 'Selected Requisition Numbers'); + if (!empty($ReqList)) { + foreach ($ReqList as $SID) : -
-
-
-
- + $options[$SID->ReqNo] = $SID->ReqNo; + endforeach; + } + echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"'); + + ?> +
+
+ +
+ + 'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ 'Select Supplier'); //print_r( $options); @@ -788,12 +804,8 @@ if (!empty($getlogpodtl)) { - - - -
-

+
+
-
-
- -
- - 'POType', 'value' => set_value('POType', SERVICE), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- -
- 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> - -
-
-
-
-
- Select Delivery By*
- - - 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> - - - - 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> - - - -
-
- +
+
+
+
+ -
-

- +
+
+ Select Delivery By*
+
+ 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> + + 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> +
+ +
+

+
'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); ?>
-
- +
+
+ +
+ 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> + +
+
- - -
-
-
-
- - +
+
+
+
+ +
+ 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + echo form_input($data); + ?> +
+
+
@@ -903,14 +906,8 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
- - - -
-
-
-
-
+
+
@@ -919,14 +916,8 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
- - - - -
-
-
-
+
+
@@ -936,9 +927,12 @@ if (!empty($getlogpodtl)) { ?>
-
-
-
+
+
+
+
+
+
@@ -952,14 +946,7 @@ if (!empty($getlogpodtl)) {
-
-
-
- -
-
-
-
+
@@ -994,7 +981,38 @@ if (!empty($getlogpodtl)) {
-
+
+ + PaymentID) { + $optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms; + } + endforeach; + foreach ($Payment as $pay1) : + if ($Terms != $pay1->PaymentID) { + $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms; + } + endforeach; + } + echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2'); + ?> +
+ +
+
+
+
+
@@ -1029,11 +1047,8 @@ if (!empty($getlogpodtl)) {
-
-
- -
- +
+
'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); @@ -1041,85 +1056,22 @@ if (!empty($getlogpodtl)) { ?>
-
-
- - - PaymentID) { - - $optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms; - } - endforeach; - foreach ($Payment as $pay1) : - - if ($Terms != $pay1->PaymentID) { - - $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms; - } - endforeach; - } - - echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2'); - - ?> - - - - -
-
- - -
- - -
- - - - -
- - - - - - -
-
- - - +
+ + +
+
-
@@ -1153,7 +1105,7 @@ if (!empty($getlogpodtl)) {
- +
'Select Req No'); @@ -1200,7 +1152,7 @@ if (!empty($getlogpodtl)) {
- +
'Item Code'); @@ -1262,7 +1214,7 @@ if (!empty($getlogpodtl)) {
- +
'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()'); @@ -1271,7 +1223,7 @@ if (!empty($getlogpodtl)) {
- +
'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()'); @@ -1410,7 +1362,7 @@ if (!empty($getlogpodtl)) {
- Service Description * 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?> @@ -1447,7 +1399,7 @@ if (!empty($getlogpodtl)) {
- +
- +
'Item Code'); @@ -1550,7 +1502,7 @@ if (!empty($getlogpodtl)) {
- +
'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()'); @@ -1559,7 +1511,7 @@ if (!empty($getlogpodtl)) {
- +
'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()'); @@ -1696,7 +1648,7 @@ if (!empty($getlogpodtl)) {
- Service Description* 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?> @@ -1738,7 +1690,7 @@ if (!empty($getlogpodtl)) {
- +
- +
'Item Code'); @@ -1841,7 +1793,7 @@ if (!empty($getlogpodtl)) {
- +
'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); @@ -1850,7 +1802,7 @@ if (!empty($getlogpodtl)) {
- +
'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); @@ -1987,7 +1939,7 @@ if (!empty($getlogpodtl)) {
- Service Description* 'ViewtxtSpcialInstruction', 'value' => set_value('ViewtxtSpcialInstruction'), 'id' => 'ViewtxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40', 'readonly' => 'true'); echo form_textarea($data); ?> @@ -2207,7 +2159,7 @@ if (!empty($getlogpodtl)) {
- +
'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 78fd2f8f..4b3e46f3 100644 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -87,6 +87,36 @@ if(!empty($INRSYMBOL)) .num{ text-align:right; } + .header-container { + display: flex; + justify-content: space-between; + align-items: center; + padding: 25px; + } + + .header-container h2 { + flex: 1; + text-align: center; + margin: 0; + } + + .centered { + display: flex; + /* justify-content: center; */ + align-items: center; + height: 10vh; + } + + .centered label, + .centered input { + margin: 0 5px; + } + + .mandatory { + color: red; + text-align: right; + background-color: white; + } #DomesticNOT { margin-top:200px; z-index: 1080 !important; @@ -312,74 +342,43 @@ function vaildateBeforeOpenModal()
-
- -

Capital Purchase Order

-
- Back -
- -
+
+

Capital Purchase Order

+ Back +
-
-
-
-
- +
+
+
+ 'Selected Requisition Numbers'); if(!empty($ReqList)) - { - foreach ($ReqList as $SID): - - // print_r($SID->ReqNo); - $options[$SID->ReqNo] = $SID->ReqNo ."-". $SID->ReqBy; - $ReqType = $SID->ReqType; - endforeach; - } - echo form_multiselect('RequistionNo', $options,set_value('RequistionNo', array()),'id="RequistionNo"' , 'required="true"'); - + { + foreach ($ReqList as $SID): + // print_r($SID->ReqNo); + $options[$SID->ReqNo] = $SID->ReqNo ."-". $SID->ReqBy; + $ReqType = $SID->ReqType; + endforeach; + } + echo form_multiselect('RequistionNo', $options,set_value('RequistionNo', array()),'id="RequistionNo"' , 'required="true"'); ?> -
-
- -
- - - - 'Select Currency Type '); - //print_r( $options); - - if(!empty($Currency)) - { - - - foreach ($Currency as $Cur): - - $options[$Cur->Currency_Code] = $Cur->Currency_Code.' '.' - '.' '.$Cur->Country_and_Currency; - - endforeach; - } - - echo form_dropdown('currencytype', $options,set_value('currencytype'),'id="currencytype"','class="form-control select2"' , 'required="true"'); - - ?> - -
-
- -
-
-
-
- - - +
+ +
+ + 'POType','value' => set_value('POType',CAPITAL),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ + 'Select Supplier'); //print_r( $options); @@ -389,71 +388,45 @@ function vaildateBeforeOpenModal() $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName ; endforeach; } - echo form_dropdown('drpSupplier', $options,set_value('drpSupplier'),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2'); - ?> - -
-

- + ?> +
+
+
'SupAddress','value' => set_value('SupAddress'),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40'); echo Form_textarea($data); ?>
-
- -
-
- + $options[$Cur->Currency_Code] = $Cur->Currency_Code.' '.' - '.' '.$Cur->Country_and_Currency; + + endforeach; + } + echo form_dropdown('currencytype', $options,set_value('currencytype'),'id="currencytype"','class="form-control select2"' , 'required="true"'); + ?> -
-
- -
- - 'POType','value' => set_value('POType',CAPITAL),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- -
- 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); - echo form_input($data); - ?> -
-
-
-
- -
- 'DeliveryAddr','value' => set_value('DeliveryAddr',$CompanyAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
- -
-
-
- - Select Delivery By*
+
+
+
+ Select Delivery By*
@@ -469,9 +442,8 @@ function vaildateBeforeOpenModal()
-
- -

+
+
- - -
-
- -
-
+ ?> + +
+ +
+ +
+ 'DeliveryAddr','value' => set_value('DeliveryAddr',$CompanyAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
+
+
+
+
+
+ +
-
+
*
- - -
- +
+ +
+ 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + // echo form_input($data); + $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
+
+
'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); - // echo form_input($data); - $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); + $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + echo form_input($data); ?>
-
-
-
- - - -
-
-
-
- - - +
+
+
- - - -
-
-
-
-
- +
+
+
- - - - -
-
-
-
- +
+
+
- -
-
-
-
- - +
+
+
+
+
+
+
-
-
-
-
-
-
- -
-
-
-
-
- +
+
+ +
+ + Capital Type Options -
- - 'Select'); - - - if(!empty($PoTypeOptions)) - { - foreach ($PoTypeOptions as $POpt): - - - $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; - - endforeach; - } - - echo form_dropdown('PoTypeOptions', $optionsPO,set_value('PoTypeOptions'),'id="PoTypeOptions"' ,'required="true"' ,'class="form-control select2'); + $optionsPO = array("0"=>'Select'); + if(!empty($PoTypeOptions)) + { + foreach ($PoTypeOptions as $POpt): + $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; + endforeach; + } + + echo form_dropdown('PoTypeOptions', $optionsPO,set_value('PoTypeOptions'),'id="PoTypeOptions"' ,'required="true"' ,'class="form-control select2'); - ?> -
+ ?> +
+
+
+ + 'Select Payment method'); + //print_r( $options); -
-
- -
- - PaymentID] = $payment->PaymentTerms; - endforeach; - } - - echo form_dropdown('insuranceStatus', $optionsInsurance,set_value('insuranceStatus'),'id="insuranceStatus"' ,'required="true"' ,'class="form-control select2'); + endforeach; + } + echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"'); - ?> -
- - - - -
- -
-
-
- -
- -
- 'InsuranceNumber','value' => set_value('InsuranceNumber'),'id'=>'InsuranceNumber', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - ?> -
-
-
- - - - - 'Select Payment method'); - //print_r( $options); - - if(!empty($Payment)) - { - foreach ($Payment as $payment): - - $options1[$payment->PaymentID] = $payment->PaymentTerms; - - endforeach; - } - - echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"'); - - ?> - -
- + +
+ +
+
+
+
+ +
+ +
+ + +
+
+
+ +
+ 'InsuranceNumber','value' => set_value('InsuranceNumber'),'id'=>'InsuranceNumber', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ + 'Select','1'=>'REVENUE','2'=>'CAPITAL'); + echo form_dropdown('BudgetType', $optionsnew,set_value('BudgetType'),'id="BudgetType"' ,'required="true"' ,'class="form-control select2'); + + ?> +
+
+
- -
- - -
- - 'Select','1'=>'REVENUE','2'=>'CAPITAL'); - echo form_dropdown('BudgetType', $optionsnew,set_value('BudgetType'),'id="BudgetType"' ,'required="true"' ,'class="form-control select2'); - - ?> - - -
- - - - -
-
- -
-
- - - + +
-
- Back -
-
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index d0529be9..1ea8d0fd 100644 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -1,104 +1,95 @@ - -format('d-m-Y'); $MaxPoDate = ''; $AvlAmount = 0; -$DeliverSchedule=''; -$DeliverOption=''; +$DeliverSchedule = ''; +$DeliverOption = ''; $RowCount = 0; $PrePOFile = ''; -if(!empty($MaxPODate)) -{ - foreach ($MaxPODate as $date) - { - $MaxPoDate = $date->PODate; +if (!empty($MaxPODate)) { + foreach ($MaxPODate as $date) { + $MaxPoDate = $date->PODate; } } -if(!empty($CompanyDetails)) -{ - foreach ($CompanyDetails as $Req) - { +if (!empty($CompanyDetails)) { + foreach ($CompanyDetails as $Req) { $CompanyAddress = $Req->Address; } } -if(!empty($AvlBudAmt)) -{ - - $AvlAmount = $AvlBudAmt; -//echo $AvlAmount; - -} -foreach ($PaymentTerms as $TER) -{ - $Terms=$TER->PaymentTerms; -} - - $SupId = ''; - $SupName = ''; - $Address = ''; - $PODate = ''; - $Deliverydt =''; - $DeliveryAddress =''; - $POStatus = ''; - $PONO = ''; - $totBasicAmt = 0; - $totDiscountAmt = 0.0; - $totPackagingAmt = 0.0; - $totExciseAmt = 0.0; - $totVATAmt = 0.0; //FOR SGST - $totCSTAmt = 0.0;//FOR CGST - $totGSTAmt = 0.0;//FOR IGST - - $totOtherTaxAmt = 0.0; - $totFreightAmt = 0.0; - $totInsuranceAmt = 0.0; - $totOrderSummaryAmt = 0.0; - $PaymentOtherDescription=''; - $ServiceDescription = ''; - $taxrange=""; - $modeofshipment=''; - $supplierref=''; - $suppofferno=''; - $otherref=''; - $revenuesubtype=''; - $insurencestatus=''; - $insurenceno=''; - $BudgetType = ''; +if (!empty($AvlBudAmt)) { -if(!empty($POMaster)) -{ + $AvlAmount = $AvlBudAmt; + //echo $AvlAmount; + +} +foreach ($PaymentTerms as $TER) { + $Terms = $TER->PaymentTerms; +} + +$SupId = ''; +$SupName = ''; +$Address = ''; +$PODate = ''; +$Deliverydt = ''; +$DeliveryAddress = ''; +$POStatus = ''; +$PONO = ''; +$totBasicAmt = 0; +$totDiscountAmt = 0.0; +$totPackagingAmt = 0.0; +$totExciseAmt = 0.0; +$totVATAmt = 0.0; //FOR SGST +$totCSTAmt = 0.0; //FOR CGST +$totGSTAmt = 0.0; //FOR IGST + +$totOtherTaxAmt = 0.0; +$totFreightAmt = 0.0; +$totInsuranceAmt = 0.0; +$totOrderSummaryAmt = 0.0; +$PaymentOtherDescription = ''; +$ServiceDescription = ''; +$taxrange = ""; +$modeofshipment = ''; +$supplierref = ''; +$suppofferno = ''; +$otherref = ''; +$revenuesubtype = ''; +$insurencestatus = ''; +$insurenceno = ''; +$BudgetType = ''; + +if (!empty($POMaster)) { // print_r($POMaster); - + // print_r($Payment); // echo "****"; // print_r($PaymentTerms); - foreach ($POMaster as $Req) - { + foreach ($POMaster as $Req) { $SupId = $Req->SupplierID; - $SupName = $Req->SupplierName; - $Address = $Req->MSME ? "MSME : ".$Req->MSME."\n".$Req->Address :$Req->Address ; - + $SupName = $Req->SupplierName; + $Address = $Req->MSME ? "MSME : " . $Req->MSME . "\n" . $Req->Address : $Req->Address; + $Pdt = new DateTime($Req->PODate); $PODate = $Pdt->format('d-m-Y'); $DeliverOption = $Req->DeliveryOption; - $DeliverSchedule = $Req->DeliverySchedule; + $DeliverSchedule = $Req->DeliverySchedule; $Ddt = new DateTime($Req->DeliveryDate); //echo $Req->DeliveryDate."
"; $Deliverydt = $Ddt->format('d-m-Y'); //echo $Deliverydt; - $PaymentOtherDescription=$Req->PaymentOtherDescription; + $PaymentOtherDescription = $Req->PaymentOtherDescription; //echo $PaymentOtherDescription; - $DeliveryAddress =$Req->DeliveryAddress; + $DeliveryAddress = $Req->DeliveryAddress; $POStatus = $Req->StatusName; - $PONO = $Req->PONO; - $taxrange=$Req->PORange; + $PONO = $Req->PONO; + $taxrange = $Req->PORange; //echo $taxrange . "t"; - $ServiceDescription = $Req->ServiceDescription; + $ServiceDescription = $Req->ServiceDescription; $modeofshipment = $Req->Mode_Of_Shipment; - $supplierref = $Req->Supplier_Reference; + $supplierref = $Req->Supplier_Reference; $suppofferno = $Req->Supplier_Offer_No; $otherref = $Req->Other_Reference; $revenuesubtype = $Req->POSubType; @@ -106,190 +97,182 @@ if(!empty($POMaster)) $insurenceno = $Req->InsuranceNumber; $BudgetType = $Req->BudgetType; $PrePOFile = $Req->POFile; - } + } } //echo $BudgetType; -if(!empty($RequistionDetails)) -{ +if (!empty($RequistionDetails)) { - foreach ($RequistionDetails as $ReqDet) - { - $Reqon=$ReqDet->ReqDate; - $Requestedby=$ReqDet->Requestedby; + foreach ($RequistionDetails as $ReqDet) { + $Reqon = $ReqDet->ReqDate; + $Requestedby = $ReqDet->Requestedby; //echo $ReqDet->FirstName . "3";die(); - if( $Requestedby != '' ) - { - $RequesterName=$ReqDet->FirstName; + if ($Requestedby != '') { + $RequesterName = $ReqDet->FirstName; } - $Status=$ReqDet->Status; - } + $Status = $ReqDet->Status; + } } //echo $ServiceDescription; -foreach ($POSTATUS as $PST ) -{ - $POStatus=$PST->StatusName; +foreach ($POSTATUS as $PST) { + $POStatus = $PST->StatusName; } -if(!empty($INRSYMBOL)) -{ - - foreach($INRSYMBOL as $INRS) - { - $INRSYM=$INRS->FontCode2000; +if (!empty($INRSYMBOL)) { + foreach ($INRSYMBOL as $INRS) { + $INRSYM = $INRS->FontCode2000; } } ?> + + + - - - - - + tinymce.init({ + selector: "textarea#txtSpcialInstruction", + menubar: false, + statusbar: false, + toolbar: false, + //plugins: "link image" + }); + tinymce.init({ + selector: "textarea#Edit_Service_Description", + menubar: false, + statusbar: false, + toolbar: false, + //plugins: "link image" + }); + - +
- 'form-label-left CreatePO ','name' => 'CreatePO','id' => 'CreatePO'); - - echo form_open(base_url().'/purchaseorder/addPO/',$attributes); ?> - -
-
-

Amendment Revenue Purchase Order-

+ 'form-label-left CreatePO ', 'name' => 'CreatePO', 'id' => 'CreatePO'); -
-
-
-
-
- - 'Selected Requisition Numbers'); - if(!empty($ReqList)) - { - foreach ($ReqList as $SID): - - $options[$SID->ReqNo] = $SID->ReqNo ; - //$ReqType = $SID->ReqType; - endforeach; - } - echo form_multiselect('RequistionNo', $options,set_value('RequistionNo', array()),'id="RequistionNo"' ,'required="true"' , 'height="400px"' ); - ?> + echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> + +
+
+
+
+
-
- -
- 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;','readonly'=>'true'); - echo form_input($data); - ?> -
-
-
-
-
-
- - 'Select Supplier'); - //print_r( $options); - - if(!empty($Suplist)) - { - foreach ($Suplist as $SID): - $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName ; - endforeach; - } - - echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2','disabled=disabled','readonly=readonly'); - - ?> -
-
- -
- - 'POType','value' => set_value('POType',REVENUE),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- Select Tax Range
- - - - "Range","id"=>"Local","value"=>"0", 'checked'=>('0' == $taxrange) ? TRUE : FALSE,'onchange'=>'SetVatorCST();')); ?>   - "Range","id"=>"Inter_state","value"=>"1", 'checked'=>('1' == $taxrange) ? TRUE : FALSE,'onchange'=>'SetVatorCST();')); ?> - - -
- - -
-
- - Select Delivery By*
- - - 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> - - - 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> - - - - -
+
+

Amendment Revenue Purchase Order-

+ Back
-
-
- -
- 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true' ,'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
-
- -
- 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40','readonly' => 'true'); - echo Form_textarea($data); - ?> -
-
-
- - - -
- - 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); - echo form_input($data); - ?> - -
-
- -
-
- - -
-
-
-
- - -
- - 'addmodeofshipment','value' => set_value('addmodeofshipment',$modeofshipment),'id'=>'addmodeofshipment', 'class' => 'form-control','readonly' => 'readonly'); - echo form_input($data); - ?> -
- - - -
-
-
-
-
- -
- - 'amendsupplierreference','value' => set_value('amendsupplierreference',$supplierref),'id'=>'amendsupplierreference', 'class' => 'form-control','readonly' => 'readonly','maxlength'=>'40'); - echo form_input($data); - ?> -
- - - - -
-
-
-
- -
- - 'amendsupplierofferno','value' => set_value('amendsupplierofferno',$suppofferno),'id'=>'amendsupplierofferno', 'class' => 'form-control','readonly' => 'readonly'); - echo form_input($data); - ?> -
- -
-
-
-
- - -
- - 'amendotherreference','value' => set_value('amendotherreference',$otherref),'id'=>'amendotherreference', 'class' => 'form-control','readonly' => 'readonly'); - echo form_input($data); - ?> -
-
- -
-
-
-
-
-
-
-
- - - -
- - 'Select Work Status'); - - - if(!empty($PoTypeOptions)) - { - foreach ($PoTypeOptions as $POpt): - - - $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; - - endforeach; - } - - echo form_dropdown('PoTypeOptions', $optionsPO,$revenuesubtype,set_value('PoTypeOptions'),'id="PoTypeOptions"' ,'required="true"' ,'class="form-control'); - - - ?> -
- - - -
-
- - 'Yes','0'=>'No'); - echo form_dropdown('insurancestatus', $optionsnew,set_value('insurancestatus'),'id="insurancestatus"' ,'required="true"' ,'class="form-control select2', 'readonly ="true"'); - - ?> -
-
-
- - -
- -
- 'InsuranceNumber','InsuranceNumber' => set_value('InsuranceNumber',$insurenceno),'id'=>'InsuranceNumber', 'class' => 'form-control' ,'required' => 'true'); - echo form_input($data); - ?> -
-
-
- - - - - PaymentID){ - //echo "$Terms"; - //echo "$pay2->PaymentTerms"; - - ?> - - PaymentID] = $pay2->PaymentTerms; - - } - - foreach ($Payment as $pay1): - - if($Terms!=$pay1->PaymentID){ - - $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms; - - } - endforeach; - } - - echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2'); - - ?> - -
- - - - - -
- - -
- - - - -
- - - - -
-
- -
- - - - -
-
-
- - - - - - - - - - - - -
- - - -
-format('d-m-Y');?> -
- -
-
- - -
- +
+
\ No newline at end of file diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 1314be29..0648ce6e 100644 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -1837,6 +1837,37 @@ if (!empty($getlogpodtl)) { .num { text-align: right; } + .header-container { + display: flex; + justify-content: space-between; + align-items: center; + padding: 25px; + } + + .header-container h2 { + flex: 1; + text-align: center; + margin: 0; + } + + .centered { + display: flex; + /* justify-content: center; */ + align-items: center; + height: 10vh; + } + + .centered label, + .centered input { + margin: 0 5px; + } + + .mandatory { + color: red; + text-align: right; + background-color: white; + } +
-
+
-

Edit Revenue Purchase Order -

+

Edit Revenue Purchase Order -

-

Amended Revenue Purchase Order -

+

Amended Revenue Purchase Order -

+ Back
-
+ +
-
- - 'Selected Requisition Numbers'); - if (!empty($ReqList)) { - foreach ($ReqList as $SID) : + + 'Selected Requisition Numbers'); + if (!empty($ReqList)) { + foreach ($ReqList as $SID) : - $options[$SID->ReqNo] = $SID->ReqNo; - //$ReqType = $SID->ReqType; - endforeach; - } - echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"'); + $options[$SID->ReqNo] = $SID->ReqNo; + //$ReqType = $SID->ReqType; + endforeach; + } + echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"'); + ?> +
+
+ +
+ + 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); ?>
-
- -
- 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); - echo form_input($data); - ?> -
-
-
-
-
- - 'Select Supplier'); - //print_r( $options); +
+ + 'Select Supplier'); + //print_r( $options); - if (!empty($Suplist)) { - foreach ($Suplist as $SID) : - $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName ; - endforeach; - } + if (!empty($Suplist)) { + foreach ($Suplist as $SID) : + $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName; + endforeach; + } - echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2'); - ?> - -
-
- -
- - 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- Select Tax Range
- - - - 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local', 'onchange' => 'SetVatorCST();')); ?> - - - 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state', 'onchange' => 'SetVatorCST();')); ?> - - - -
- - -
-
- Select Delivery By*
- - - 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> - - 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> - - -
-
-
-
- -
- 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
-
- -
- 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
-
- -
- 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); - echo form_input($data); - ?> - -
-
- -
+ echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2'); + ?> +
- -
-
-
-
- - -
- - 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $modeofshipment), 'id' => 'editmodeofshipment', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
-
-
-
-
- -
- - 'editsupplierreference', 'value' => set_value('editsupplierreference', $supplierref), 'id' => 'editsupplierreference', 'class' => 'form-control', 'maxlength' => '40'); - echo form_input($data); - ?> -
- -
-
-
-
- -
- - 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $suppofferno), 'id' => 'editsupplierofferno', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
-
-
-
- - -
- - 'editotherreference', 'value' => set_value('editotherreference', $otherref), 'id' => 'editotherreference', 'class' => 'form-control'); - echo form_input($data); - ?> -
-
-
-
+
+ +
+ 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?>
-
- - -
-
-
-
- -
- - 'Select Work Status'); - - - if (!empty($PoTypeOptions)) { - - foreach ($PoTypeOptions as $POpt) : - - if ($revenuesubtype == $POpt->ConfigValue) { - $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; - } - - endforeach; - foreach ($PoTypeOptions as $POpt1) : - - if ($revenuesubtype != $POpt1->ConfigValue) { - $optionsPO[$POpt1->ConfigValue] = $POpt1->ConfigValue; - } - - endforeach; - } - - echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2'); - ?> -
-
-
- - 'Yes', '0' => 'No'); - echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus"', 'required="true"', 'class="form-control select2'); - ?> -
-
-
-
- -
- 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); - echo form_input($data); - ?> -
-
-
- - - PaymentID] = $pay->PaymentTerms; - - endforeach; - } - echo form_dropdown('PaymentTerms', $options6, set_value('PaymentTerms', $Terms), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2'); - ?> - - -
- -
-
-
-
- - - -
- -
-
- -
- - - -
+
+
+
+
+ + Select Tax Range
+
+ + 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local', 'onchange' => 'SetVatorCST();')); ?> + + 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state', 'onchange' => 'SetVatorCST();')); ?> + +
+
+
+
+ Select Delivery By*
+
+ + 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> + + 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> +
+ +
+
+ +
+ 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + echo form_input($data); + ?> + +
+
+ +
+ +
+ 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
+
+
+
+
+
+
+ +
+ 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + echo form_input($data); + ?> +
+
+
+ + +
+ + 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $modeofshipment), 'id' => 'editmodeofshipment', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+ +
+ + 'editsupplierreference', 'value' => set_value('editsupplierreference', $supplierref), 'id' => 'editsupplierreference', 'class' => 'form-control', 'maxlength' => '40'); + echo form_input($data); + ?> +
+ +
+
+ +
+ + 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $suppofferno), 'id' => 'editsupplierofferno', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+
+
+
+
+ + +
+ + 'editotherreference', 'value' => set_value('editotherreference', $otherref), 'id' => 'editotherreference', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+ +
+ + 'Select Work Status'); + + + if (!empty($PoTypeOptions)) { + + foreach ($PoTypeOptions as $POpt) : + + if ($revenuesubtype == $POpt->ConfigValue) { + $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; + } + + endforeach; + foreach ($PoTypeOptions as $POpt1) : + + if ($revenuesubtype != $POpt1->ConfigValue) { + $optionsPO[$POpt1->ConfigValue] = $POpt1->ConfigValue; + } + + endforeach; + } + + echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2'); + ?> + +
+
+
+ + + PaymentID] = $pay->PaymentTerms; + + endforeach; + } + echo form_dropdown('PaymentTerms', $options6, set_value('PaymentTerms', $Terms), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2'); + ?> + + + +
+ +
+
+
+
+
+ + 'Yes', '0' => 'No'); + echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus"', 'required="true"', 'class="form-control select2'); + ?> +
+
+ +
+ 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ + + +
+
+
+
+
+