Merge remote-tracking branch 'origin/cam'

kgOrdersClient/View.OrderEntryCorrugated.dfm

@@ -200,6 +200,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
     HeightPercent = 100.000000000000000000
     HideSelection = False
     WidthPercent = 100.000000000000000000
+    OnExit = edtPriceExit
     DataField = 'staff_fields_price'
     DataSource = wdsOrder
   end

kgOrdersClient/View.OrderEntryCorrugated.html

@@ -385,8 +385,8 @@
         <hr class="custom-hr">
         <div class="row pb-3">
             <div class="col-auto">
-                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label">Special Instructions</label>
-                <textarea id="edtspecialinstructions" class="form-control mb-3" style=" width: 800px; height: 150px;"></textarea>
+                <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label">Special Instructions (Max Length 2048 characters)</label>
+                <textarea id="edtspecialinstructions" class="form-control mb-3" style=" width: 1100px; height: 150px;" maxlength="2048"></textarea>
             </div>
         </div>
     </div>

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -232,6 +232,7 @@ type
     procedure wdbcbQuickbooksItemChange(Sender: TObject);
     procedure btnQBClick(Sender: TObject);
     function VerifyQBOrder: Boolean;
+    procedure edtPriceExit(Sender: TObject);
   private
     FAgencyCode: string;
     FCurrentReportType: string;
@@ -952,6 +953,18 @@ begin
                               ' - ' + xdwdsOrder.FieldByName('staff_fields_job_name').AsString;
 end;
 
+procedure TFOrderEntryCorrugated.edtPriceExit(Sender: TObject);
+var
+  v: Double;
+begin
+  if TryStrToFloat(edtPrice.Text, v) then
+  begin
+    xdwdsOrderstaff_fields_price.AsFloat := v;
+    xdwdsOrderstaff_fields_price.AsString := FormatFloat('0.00', v);
+    edtPrice.Text := FormatFloat('0.00', v)
+  end;
+end;
+
 procedure TFOrderEntryCorrugated.ViewMode;
 begin
   btnPDF.Enabled := true;
@@ -1145,7 +1158,7 @@ begin
     input.classList.remove('is-invalid');
 
   input := TJSHTMLInputElement(document.getElementById('edtprice'));
-  if ( ( edtPrice.Text = '' ) or ( StrToFloat(edtPrice.Text) <= 0 ) )then
+  if ( ( edtPrice.Text = '' ) or ( StrToFloat(edtPrice.Text) < 0 ) )then
   begin
 
     input.classList.add('is-invalid');

kgOrdersClient/View.OrderEntryCuttingDie.dfm

@@ -105,6 +105,7 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     ElementID = 'edtprice'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
+    OnExit = edtPriceExit
     DataField = 'staff_fields_price'
     DataSource = wdsOrder
   end

kgOrdersClient/View.OrderEntryCuttingDie.html

@@ -158,8 +158,8 @@
     <hr class="custom-hr">
     <div class="row">
         <div class="col-auto">
-            <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label">Special Instructions</label>
-            <textarea id="edtspecialinstructions" class="form-control mb-3" style=" width: 800px; height: 150px;"></textarea>
+            <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label">Special Instructions (Max Length 2048 characters)</label>
+                <textarea id="edtspecialinstructions" class="form-control mb-3" style=" width: 1100px; height: 150px;" maxlength="2048"></textarea>
         </div>
     </div>
 </div>

kgOrdersClient/View.OrderEntryCuttingDie.pas

@@ -105,6 +105,7 @@ type
     function VerifyQBOrder(): boolean;
     procedure wcbQBItemChange(Sender: TObject);
     procedure edtJobNameExit(Sender: TObject);
+    procedure edtPriceExit(Sender: TObject);
   private
     FAgencyCode: string;
     FCurrentReportType: string;
@@ -648,6 +649,18 @@ begin
                               ' - ' + xdwdsOrder.FieldByName('staff_fields_job_name').AsString;
 end;
 
+procedure TFOrderEntryCuttingDie.edtPriceExit(Sender: TObject);
+var
+  v: Double;
+begin
+  if TryStrToFloat(edtPrice.Text, v) then
+  begin
+    xdwdsOrderstaff_fields_price.AsFloat := v;
+    xdwdsOrderstaff_fields_price.AsString := FormatFloat('0.00', v);
+    edtPrice.Text := FormatFloat('0.00', v)
+  end;
+end;
+
 procedure TFOrderEntryCuttingDie.ViewMode;
 begin
   btnPDF.Enabled := true;
@@ -738,7 +751,7 @@ begin
     input.classList.remove('is-invalid');
 
   input := TJSHTMLInputElement(document.getElementById('edtprice'));
-  if edtPrice.Text = '' then
+  if ( ( edtPrice.Text = '' ) or ( StrToFloat(edtPrice.Text) < 0 ) )then
   begin
 
     input.classList.add('is-invalid');
@@ -748,7 +761,7 @@ begin
     input.classList.remove('is-invalid');
 
   input := TJSHTMLInputElement(document.getElementById('edtquantity'));
-  if edtQuantity.Text = '' then
+  if ( ( edtQuantity.Text = '' ) or ( StrToFloat(edtQuantity.Text) <= 0 ) ) then
   begin
 
     input.classList.add('is-invalid');

kgOrdersClient/View.OrderEntryWeb.dfm

@@ -194,6 +194,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     HeightPercent = 100.000000000000000000
     ShowFocus = False
     WidthPercent = 100.000000000000000000
+    OnExit = edtPriceExit
     DataField = 'staff_fields_price'
     DataSource = wdsOrder
   end

kgOrdersClient/View.OrderEntryWeb.html

@@ -449,8 +449,8 @@
     <hr class="custom-hr">
     <div class="row">
         <div class="col-auto">
-            <label style="font-weight: 700; font-size: 15px;" class="form-label">Comments</label>
-            <textarea id="edtcomments" class="form-control mb-3" style=" width: 800px; height: 150px;"></textarea>
+            <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label">Special Instructions (Max Length 2048 characters)</label>
+                <textarea id="edtcomments" class="form-control mb-3" style=" width: 1100px; height: 150px;" maxlength="2048"></textarea>
         </div>
     </div>
 </div>

kgOrdersClient/View.OrderEntryWeb.pas

@@ -239,6 +239,7 @@ type
     procedure btnQBClick(Sender: TObject);
     function VerifyQBOrder: Boolean;
     [async] procedure AddEstimate(orderID: string);
+    procedure edtPriceExit(Sender: TObject);
   private
     FModalAction: string;
     FAgencyCode: string;
@@ -902,6 +903,18 @@ begin
                               ' - ' + xdwdsOrder.FieldByName('staff_fields_job_name').AsString;
 end;
 
+procedure TFOrderEntryWeb.edtPriceExit(Sender: TObject);
+var
+  v: Double;
+begin
+  if TryStrToFloat(edtPrice.Text, v) then
+  begin
+    xdwdsOrderstaff_fields_price.AsFloat := v;
+    xdwdsOrderstaff_fields_price.AsString := FormatFloat('0.00', v);
+    edtPrice.Text := FormatFloat('0.00', v)
+  end;
+end;
+
 procedure TFOrderEntryWeb.ViewMode;
 begin
   btnPDF.Enabled := true;
@@ -995,7 +1008,7 @@ begin
     input.classList.remove('is-invalid');
 
   input := TJSHTMLInputElement(document.getElementById('edtprice'));
-  if edtPrice.Text = '' then
+  if ( ( edtPrice.Text = '' ) or ( StrToFloat(edtPrice.Text) < 0 ) )then
   begin
 
     input.classList.add('is-invalid');
@@ -1005,7 +1018,7 @@ begin
     input.classList.remove('is-invalid');
 
   input := TJSHTMLInputElement(document.getElementById('edtquantity'));
-  if edtQuantity.Text = '' then
+  if ( ( edtQuantity.Text = '' ) or ( StrToFloat(edtQuantity.Text) <= 0 ) ) then
   begin
 
     input.classList.add('is-invalid');

kgOrdersClient/css/app.css

@@ -18,6 +18,18 @@ input[type="text"] {
   padding-left: 5px;
 }
 
+/* Chrome, Safari, Edge, Opera */
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+
+/* Firefox */
+input[type=number] {
+    -moz-appearance: textfield;
+}
+
 is-invalid .form-check-input {
   border: 1px solid #dc3545 !important;
 }

kgOrdersServer/bin/kgOrdersServer.ini

@@ -2,13 +2,13 @@
 MemoLogLevel=5
 FileLogLevel=5
 webClientVersion=0.9.12
-LogFileNum=106
+LogFileNum=110
 
 [Database]
-Server=192.168.116.132
+--Server=192.168.116.132
 --Server=192.168.102.129
 --Server=192.168.75.133
---Server=192.168.159.10
+Server=192.168.159.10
 --Database=kg_order_entry
 --Username=root
 --Password=emsys01