Made small finishing touches to Cutting Die setup

kgOrdersClient/View.OrderEntryCuttingDie.dfm

@@ -373,6 +373,18 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
     DataField = 'ORDER_ID'
     DataSource = wdsOrder
   end
+  object WebButton1: TWebButton
+    Left = 746
+    Top = 495
+    Width = 96
+    Height = 25
+    Caption = 'Send To QB'
+    ChildOrder = 30
+    ElementID = 'btnsendtoqb'
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    OnClick = WebButton1Click
+  end
   object wdsOrder: TWebDataSource
     AutoEdit = False
     DataSet = xdwdsOrder

kgOrdersClient/View.OrderEntryCuttingDie.html

@@ -3,7 +3,10 @@
 
     <!-- Left-aligned label -->
     <div class="me-auto ps-3">
-      <label id="lbl_form_state" class="form-label mb-0 fw-bold text-uppercase text-nowrap text-danger" style="font-size: 16px;">View Mode</label>
+      <label id="lbl_order_type" class="form-label mb-0 fw-bold text-uppercase text-nowrap" style="font-size: 16px;">Cutting Die  -</label>
+    </div>
+    <div class="me-auto ps-2">
+      <label id="lbl_form_state" class="form-label mb-0 fw-bold text-uppercase text-nowrap text-danger" style="font-size: 16px;"> View Mode</label>
     </div>
 
     <!-- Right-aligned buttons -->
@@ -21,14 +24,17 @@
         <button id="btndelete" class="btn btn-danger btn-sm">Delete</button>
       </li>
       <li class="nav-item pe-2">
-        <button id="btnpdf" class="btn btn-primary btn-sm">PDF</button>
-      </li>
-      <li class="nav-item pe-2">
         <button id="btnconfirm" class="btn btn-success btn-sm">Save</button>
       </li>
       <li class="nav-item pe-2">
         <button id="btncancel" class="btn btn-danger btn-sm">Cancel</button>
       </li>
+      <li class="nav-item pe-2">
+        <button id="btnpdf" class="btn btn-primary btn-sm">PDF</button>
+      </li>
+      <li class="nav-item pe-2">
+        <button id="btnsendtoqb" class="btn btn-primary btn-sm">Send To QB</button>
+      </li>
       <li class="nav-item">
         <button id="btnclose" class="btn btn-primary btn-sm">Close</button>
       </li>
@@ -54,9 +60,9 @@
                     Please Provide a Customer ID.
                 </div>
             </div>
-        <div class="col-auto">
-            <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">In Quickbooks?:</label>
-            <input id="wdbcbinqb" type="checkbox">
+        <div class="col-auto d-flex flex-column">
+          <label for="wdbcbinqb" class="form-label mt-2" style="font-weight: 700; font-size: 15px;">In Quickbooks?:</label>
+          <input id="wdbcbinqb" type="checkbox" class="form-check-input mt-1">
         </div>
         <div class="col-auto">
             <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quickbooks Order Number:</label>

kgOrdersClient/View.OrderEntryCuttingDie.pas

@@ -74,6 +74,7 @@ type
     xdwdsOrderORDER_ID: TIntegerField;
     edtOrderNum: TWebDBEdit;
     xdwdsOrderIN_QB: TStringField;
+    WebButton1: TWebButton;
     procedure btnSaveClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure WebFormCreate(Sender: TObject);
@@ -95,6 +96,7 @@ type
     procedure WebButton2Click(Sender: TObject);
     procedure ShowAddAddressForm();
     [async] procedure SendAddressToServer(AddressJSON: TJSONObject);
+    procedure WebButton1Click(Sender: TObject);
   private
     FAgencyCode: string;
     FCurrentReportType: string;
@@ -131,7 +133,6 @@ begin
         orderID := orderInfo;
         mode := modeParam;
         notification := info;
-        console.log('Mode in createform: ' + modeParam);
 
         InitializeForm;
       end;
@@ -142,7 +143,6 @@ end;
 
 [async] procedure TFOrderEntryCuttingDie.InitializeForm;
 begin
-  console.log('The mode in initialize form is: ' + mode);
   if mode = 'ADD' then
   begin
     await(getCustomer(customerID));
@@ -158,6 +158,12 @@ begin
     ShowToast(notification);
 end;
 
+
+procedure TFOrderEntryCuttingDie.WebButton1Click(Sender: TObject);
+begin
+  ShowToast('Sending Orders To QuickBooks is not yet Implemented', 'info');
+end;
+
 procedure TFOrderEntryCuttingDie.WebButton2Click(Sender: TObject);
 begin
   ShowAddAddressForm();
@@ -538,12 +544,11 @@ begin
           [Order_ID]));
     order :=  TJSObject(xdcResponse.Result);
     data := TJSArray(order['data']);
+
     xdwdsOrder.Close;
     xdwdsOrder.SetJsonData(order);
     xdwdsOrder.Open;
 
-    console.log(order);
-
     // Dates need to be manually set
     if not (xdwdsOrderstaff_fields_order_date.AsString = '') then
       dtpOrderDate.Date := StrToDateTime(xdwdsOrderstaff_fields_order_date.Value)

kgOrdersClient/View.Orders.pas

@@ -527,6 +527,12 @@ procedure TFViewOrders.wdbtcOrdersDblClickCell(Sender: TObject; ACol,
 begin
   OrderID := wdbtcOrders.Cells[0, ARow];
   orderType :=  wdbtcOrders.Cells[4, ARow].Split([' '])[0];
+
+
+  // Parameter 1: OrderID: The ID of the order, used when editting an existing order.
+  // Parameter 2: CustomerID: The ID of the customer, used when adding a new order. Blank when editting an existing order because the customer id is already attached to the order.
+  // Parameter 3: Mode: EDIT if editting an existing order, ADD if adding a new order.
+  // Parameter 4: orderType: Type of order so we go to the correct order entry page.
   orderEntry(OrderID, '', 'EDIT', orderType);
 end;
 
@@ -785,9 +791,7 @@ end;
 procedure TFViewOrders.OrderEntry(orderInfo, customerInfo, mode, orderType: string);
 begin
   if orderType = 'corrugated' then
-    begin
-      FViewMain.ViewOrderEntryCorrugated(orderInfo, customerInfo, mode, '');
-    end
+    FViewMain.ViewOrderEntryCorrugated(orderInfo, customerInfo, mode, '')
   else if orderType = 'web' then
     FViewMain.ViewOrderEntryWeb(orderInfo, customerInfo, mode, '')
   else

kgOrdersServer/kgOrdersServer.ini

@@ -2,7 +2,7 @@
 MemoLogLevel=3
 FileLogLevel=5
 webClientVersion=0.9.7
-LogFileNum=864
+LogFileNum=865
 
 [Database]
 Server=192.168.159.144