[Shopify] Log Skipped Records on export processes

Apps/W1/Shopify/app/src/Companies/Codeunits/ShpfyCompanyExport.Codeunit.al

@@ -1,5 +1,6 @@
 namespace Microsoft.Integration.Shopify;
 
+using Microsoft.Integration.Shopify;
 using Microsoft.Sales.Customer;
 using Microsoft.Foundation.Company;
 using Microsoft.Foundation.Address;
@@ -36,6 +37,7 @@ codeunit 30284 "Shpfy Company Export"
         Shop: Record "Shpfy Shop";
         CompanyAPI: Codeunit "Shpfy Company API";
         CatalogAPI: Codeunit "Shpfy Catalog API";
+        ShpfySkipRecord: Codeunit "Shpfy Skip Record";
         CreateCustomers: Boolean;
         CountyCodeTooLongLbl: Label 'Can not export customer %1 %2. The length of the string is %3, but it must be less than or equal to %4 characters. Value: %5, field: %6', Comment = '%1 - Customer No., %2 - Customer Name, %3 - Length, %4 - Max Length, %5 - Value, %6 - Field Name';
 
@@ -44,9 +46,12 @@ codeunit 30284 "Shpfy Company Export"
         ShopifyCompany: Record "Shpfy Company";
         ShopifyCustomer: Record "Shpfy Customer";
         CompanyLocation: Record "Shpfy Company Location";
+        EmptyEmailAddressLbl: Label 'Customer (Company) has no e-mail address.';
     begin
-        if Customer."E-Mail" = '' then
+        if Customer."E-Mail" = '' then begin
+            ShpfySkipRecord.LogSkippedRecord(Customer.RecordId, 'Customer does not have an email address.', Shop);
             exit;
+        end;
 
         if CreateCompanyMainContact(Customer, ShopifyCustomer) then
             if FillInShopifyCompany(Customer, ShopifyCompany, CompanyLocation) then
@@ -180,10 +185,13 @@ codeunit 30284 "Shpfy Company Export"
     var
         ShopifyCompany: Record "Shpfy Company";
         CompanyLocation: Record "Shpfy Company Location";
+        CompanyWithPhoneNoOrEmailExistsLbl: Label 'Company already exists with the same e-mail or phone.';
     begin
         ShopifyCompany.Get(CompanyId);
-        if ShopifyCompany."Customer SystemId" <> Customer.SystemId then
+        if ShopifyCompany."Customer SystemId" <> Customer.SystemId then begin
+            ShpfySkipRecord.LogSkippedRecord(ShopifyCompany.Id, Customer.RecordId, CompanyWithPhoneNoOrEmailExistsLbl, Shop);
             exit;
+        end;
 
         CompanyLocation.SetRange("Company SystemId", ShopifyCompany.SystemId);
         CompanyLocation.FindFirst();

Apps/W1/Shopify/app/src/Customers/Codeunits/ShpfyCustomerExport.Codeunit.al

@@ -39,7 +39,7 @@ codeunit 30116 "Shpfy Customer Export"
     var
         Shop: Record "Shpfy Shop";
         CustomerApi: Codeunit "Shpfy Customer API";
-        ShopifySkipRecordMgt: Codeunit "Shpfy Skip Record Mgt.";
+        ShopifySkipRecord: Codeunit "Shpfy Skip Record";
         CreateCustomers: Boolean;
         CountyCodeTooLongLbl: Label 'Can not export customer %1 %2. The length of the string is %3, but it must be less than or equal to %4 characters. Value: %5, field: %6', Comment = '%1 - Customer No., %2 - Customer Name, %3 - Length, %4 - Max Length, %5 - Value, %6 - Field Name';
 
@@ -91,7 +91,7 @@ codeunit 30116 "Shpfy Customer Export"
         EmptyEmailAddressLbl: Label 'Customer has no e-mail address.';
     begin
         if Customer."E-Mail" = '' then begin
-            ShopifySkipRecordMgt.LogSkippedRecord(Customer.RecordId, EmptyEmailAddressLbl, Shop);
+            ShopifySkipRecord.LogSkippedRecord(Customer.RecordId, EmptyEmailAddressLbl, Shop);
             exit;
         end;
 
@@ -304,7 +304,7 @@ codeunit 30116 "Shpfy Customer Export"
     begin
         ShopifyCustomer.Get(CustomerID);
         if ShopifyCustomer."Customer SystemId" <> Customer.SystemId then begin
-            ShopifySkipRecordMgt.LogSkippedRecord(ShopifyCustomer.Id, Customer.RecordId, CustomerWithPhoneNoOrEmailExistsLbl, Shop);
+            ShopifySkipRecord.LogSkippedRecord(ShopifyCustomer.Id, Customer.RecordId, CustomerWithPhoneNoOrEmailExistsLbl, Shop);
             exit;  // An other customer with the same e-mail or phone is the source of it.
         end;
 

Apps/W1/Shopify/app/src/Invoicing/Codeunits/ShpfyPostedInvoiceExport.Codeunit.al

@@ -17,7 +17,7 @@ codeunit 30362 "Shpfy Posted Invoice Export"
         DraftOrdersAPI: Codeunit "Shpfy Draft Orders API";
         FulfillmentAPI: Codeunit "Shpfy Fulfillment API";
         JsonHelper: Codeunit "Shpfy Json Helper";
-        SkipRecordMgt: Codeunit "Shpfy Skip Record Mgt.";
+        SkipRecordMgt: Codeunit "Shpfy Skip Record";
 
     trigger OnRun()
     begin
@@ -96,7 +96,7 @@ codeunit 30362 "Shpfy Posted Invoice Export"
         CustomerNotExistInShopifyLbl: Label 'Customer does not exists as Shopify company or customer.';
         PaymentTermsNotExistLbl: Label 'Payment terms %1 do not exist in Shopify.', Comment = '%1 = Payment Terms Code.';
         CustomerNoIsDefaultCustomerNoLbl: Label 'Bill-to customer no. is the default customer no. for Shopify shop.';
-        CustomerTemplateExistsLbl: Label 'Shopify Customer template exists for customer no. %1 shop %2.', Comment = '%1 = Customer No., %2 = Shop Code';
+        CustomerTemplateExistsLbl: Label 'Shopify customer template exists for customer no. %1 shop %2.', Comment = '%1 = Customer No., %2 = Shop Code';
     begin
         ShopifyCompany.SetRange("Customer No.", SalesInvoiceHeader."Bill-to Customer No.");
         if ShopifyCompany.IsEmpty() then begin

Apps/W1/Shopify/app/src/Logs/Codeunits/ShpfySkipRecordMgt.Codeunit.al

@@ -1,9 +1,9 @@
 namespace Microsoft.Integration.Shopify;
 
 /// <summary>
-/// Codeunit Shpfy Skip Record Mgt. (ID 30313).
+/// Codeunit Shpfy Skip Record (ID 30313).
 /// </summary>
-codeunit 30313 "Shpfy Skip Record Mgt."
+codeunit 30313 "Shpfy Skip Record"
 {
     Access = Internal;
     Permissions = tabledata "Shpfy Skipped Record" = rimd;

Apps/W1/Shopify/app/src/Logs/Pages/ShpfySkippedRecords.Page.al

@@ -20,7 +20,6 @@ page 30166 "Shpfy Skipped Records"
         {
             repeater(General)
             {
-                field(EntryNo; Rec."Entry No.") { }
                 field("Shopify Id"; Rec."Shopify Id") { }
                 field("Table ID"; Rec."Table ID") { }
                 field("Table Name"; Rec."Table Name") { }
@@ -40,7 +39,18 @@ page 30166 "Shpfy Skipped Records"
     {
         area(Promoted)
         {
-            actionref(Show_Promoted; Show) { }
+            group(Category_Process)
+            {
+                actionref(Show_Promoted; Show) { }
+            }
+
+            group(Category_Category4)
+            {
+                Caption = 'Log Entries';
+
+                actionref(Delete7days_Promoted; Delete7days) { }
+                actionref(Delete0days_Promoted; Delete0days) { }
+            }
         }
         area(Processing)
         {
@@ -56,6 +66,30 @@ page 30166 "Shpfy Skipped Records"
                     Rec.ShowPage();
                 end;
             }
+            action(Delete7days)
+            {
+                ApplicationArea = All;
+                Caption = 'Delete Entries Older Than 7 Days';
+                Image = ClearLog;
+                ToolTip = 'Clear the list of log entries that are older than 7 days.';
+
+                trigger OnAction();
+                begin
+                    Rec.DeleteEntries(7);
+                end;
+            }
+            action(Delete0days)
+            {
+                ApplicationArea = All;
+                Caption = 'Delete All Entries';
+                Image = Delete;
+                ToolTip = 'Clear the list of all log entries.';
+
+                trigger OnAction();
+                begin
+                    Rec.DeleteEntries(0);
+                end;
+            }
         }
     }
-}
+}

Apps/W1/Shopify/app/src/Logs/Tables/ShpfySkippedRecord.Table.al

@@ -23,13 +23,13 @@ table 30159 "Shpfy Skipped Record"
         }
         field(2; "Shopify Id"; BigInteger)
         {
-            Caption = 'Skipped Record Id';
+            Caption = 'Shopify Id';
             ToolTip = 'Specifies the Shopify Id of the skipped record.';
         }
-        field(3; "Table ID"; Integer)
+        field(3; "Table Id"; Integer)
         {
-            Caption = 'Table ID';
-            ToolTip = 'Specifies the Table ID of the skipped record.';
+            Caption = 'Table Id';
+            ToolTip = 'Specifies the Table Id of the skipped record.';
             DataClassification = SystemMetadata;
 
             trigger OnValidate()
@@ -40,13 +40,13 @@ table 30159 "Shpfy Skipped Record"
         field(4; "Table Name"; Text[250])
         {
             Caption = 'Table Name';
-            ToolTip = 'Specifies the Table Name of the skipped record.';
+            ToolTip = 'Specifies the table name of the skipped record.';
             DataClassification = SystemMetadata;
         }
         field(5; "Record ID"; RecordID)
         {
-            Caption = 'Record ID';
-            ToolTip = 'Specifies the Record ID of the skipped record.';
+            Caption = 'Record Id';
+            ToolTip = 'Specifies the record Id of the skipped record.';
 
             trigger OnValidate()
             begin
@@ -72,6 +72,9 @@ table 30159 "Shpfy Skipped Record"
         }
     }
 
+    var
+        DeleteLogEntriesLbl: Label 'Are you sure that you want to delete Shopify log entries?';
+
     local procedure GetTableCaption(): Text[250]
     var
         AllObjWithCaption: Record AllObjWithCaption;
@@ -112,4 +115,23 @@ table 30159 "Shpfy Skipped Record"
         if "Record ID".TableNo() <> 0 then
             PageManagement.PageRun("Record ID");
     end;
-}
+
+    /// <summary> 
+    /// Delete Entries.
+    /// </summary>
+    /// <param name="DaysOld">Parameter of type Integer.</param>
+    internal procedure DeleteEntries(DaysOld: Integer);
+    begin
+        if not Confirm(DeleteLogEntriesLbl) then
+            exit;
+
+        if DaysOld > 0 then begin
+            Rec.SetFilter(SystemCreatedAt, '<=%1', CreateDateTime(Today - DaysOld, Time));
+            if not Rec.IsEmpty() then
+                Rec.DeleteAll(false);
+            Rec.SetRange(SystemCreatedAt);
+        end else
+            if not Rec.IsEmpty() then
+                Rec.DeleteAll(false);
+    end;
+}

Apps/W1/Shopify/app/src/Products/Codeunits/ShpfyProductExport.Codeunit.al

@@ -59,13 +59,13 @@ codeunit 30178 "Shpfy Product Export"
         ProductEvents: Codeunit "Shpfy Product Events";
         ProductPriceCalc: Codeunit "Shpfy Product Price Calc.";
         VariantApi: Codeunit "Shpfy Variant API";
-        ShopifySkipRecordMgt: Codeunit "Shpfy Skip Record Mgt.";
+        ShopifySkipRecord: Codeunit "Shpfy Skip Record";
         OnlyUpdatePrice: Boolean;
         RecordCount: Integer;
         NullGuid: Guid;
         BulkOperationInput: TextBuilder;
         GraphQueryList: List of [TextBuilder];
-        VariantPriceCalcSkippedLbl: Label 'Variant price is not synchronized because the item is blocked and sales blocked.';
+        VariantPriceCalcSkippedLbl: Label 'Variant price is not synchronized because the item is blocked or sales blocked.';
 
     /// <summary> 
     /// Creates html body for a product from extended text, marketing text and attributes.
@@ -321,7 +321,7 @@ codeunit 30178 "Shpfy Product Export"
             if (not Item.Blocked) and (not Item."Sales Blocked") then
                 ProductPriceCalc.CalcPrice(Item, '', ItemUnitofMeasure.Code, ShopifyVariant."Unit Cost", ShopifyVariant.Price, ShopifyVariant."Compare at Price")
             else
-                ShopifySkipRecordMgt.LogSkippedRecord(ShopifyVariant.Id, Item.RecordId, VariantPriceCalcSkippedLbl, Shop);
+                ShopifySkipRecord.LogSkippedRecord(ShopifyVariant.Id, Item.RecordId, VariantPriceCalcSkippedLbl, Shop);
         if not OnlyUpdatePrice then begin
             ShopifyVariant."Available For Sales" := (not Item.Blocked) and (not Item."Sales Blocked");
             ShopifyVariant.Barcode := CopyStr(GetBarcode(Item."No.", '', ItemUnitofMeasure.Code), 1, MaxStrLen(ShopifyVariant.Barcode));
@@ -358,7 +358,7 @@ codeunit 30178 "Shpfy Product Export"
             if (not Item.Blocked) and (not Item."Sales Blocked") then
                 ProductPriceCalc.CalcPrice(Item, ItemVariant.Code, Item."Sales Unit of Measure", ShopifyVariant."Unit Cost", ShopifyVariant.Price, ShopifyVariant."Compare at Price")
             else
-                ShopifySkipRecordMgt.LogSkippedRecord(ShopifyVariant.Id, Item.RecordId, VariantPriceCalcSkippedLbl, Shop);
+                ShopifySkipRecord.LogSkippedRecord(ShopifyVariant.Id, Item.RecordId, VariantPriceCalcSkippedLbl, Shop);
         if not OnlyUpdatePrice then begin
             ShopifyVariant."Available For Sales" := (not Item.Blocked) and (not Item."Sales Blocked");
             ShopifyVariant.Barcode := CopyStr(GetBarcode(Item."No.", ItemVariant.Code, Item."Sales Unit of Measure"), 1, MaxStrLen(ShopifyVariant.Barcode));
@@ -405,7 +405,7 @@ codeunit 30178 "Shpfy Product Export"
             if (not Item.Blocked) and (not Item."Sales Blocked") then
                 ProductPriceCalc.CalcPrice(Item, ItemVariant.Code, ItemUnitofMeasure.Code, ShopifyVariant."Unit Cost", ShopifyVariant.Price, ShopifyVariant."Compare at Price")
             else
-                ShopifySkipRecordMgt.LogSkippedRecord(ShopifyVariant.Id, Item.RecordId, VariantPriceCalcSkippedLbl, Shop);
+                ShopifySkipRecord.LogSkippedRecord(ShopifyVariant.Id, Item.RecordId, VariantPriceCalcSkippedLbl, Shop);
         if not OnlyUpdatePrice then begin
             ShopifyVariant."Available For Sales" := (not Item.Blocked) and (not Item."Sales Blocked");
             ShopifyVariant.Barcode := CopyStr(GetBarcode(Item."No.", ItemVariant.Code, ItemUnitofMeasure.Code), 1, MaxStrLen(ShopifyVariant.Barcode));
@@ -553,24 +553,24 @@ codeunit 30178 "Shpfy Product Export"
         RecordRef2: RecordRef;
         VariantAction: Option " ",Create,Update;
         ItemIsBlockedLbl: Label 'Item is blocked.';
-        ItemIsDraftLbl: Label 'Shopify Product is in draft status.';
-        ItemIsArchivedLbl: Label 'Shopify Product is archived.';
+        ItemIsDraftLbl: Label 'Shopify product is in draft status.';
+        ItemIsArchivedLbl: Label 'Shopify product is archived.';
     begin
         if ShopifyProduct.Get(ProductId) and Item.GetBySystemId(ShopifyProduct."Item SystemId") then begin
             case Shop."Action for Removed Products" of
                 Shop."Action for Removed Products"::StatusToArchived:
                     if Item.Blocked and (ShopifyProduct.Status = ShopifyProduct.Status::Archived) then begin
-                        ShopifySkipRecordMgt.LogSkippedRecord(ShopifyProduct.Id, Item.RecordId, ItemIsArchivedLbl, Shop);
+                        ShopifySkipRecord.LogSkippedRecord(ShopifyProduct.Id, Item.RecordId, ItemIsArchivedLbl, Shop);
                         exit;
                     end;
                 Shop."Action for Removed Products"::StatusToDraft:
                     if Item.Blocked and (ShopifyProduct.Status = ShopifyProduct.Status::Draft) then begin
-                        ShopifySkipRecordMgt.LogSkippedRecord(ShopifyProduct.Id, Item.RecordId, ItemIsDraftLbl, Shop);
+                        ShopifySkipRecord.LogSkippedRecord(ShopifyProduct.Id, Item.RecordId, ItemIsDraftLbl, Shop);
                         exit;
                     end;
                 Shop."Action for Removed Products"::DoNothing:
                     if Item.Blocked then begin
-                        ShopifySkipRecordMgt.LogSkippedRecord(ShopifyProduct.Id, Item.RecordId, ItemIsBlockedLbl, Shop);
+                        ShopifySkipRecord.LogSkippedRecord(ShopifyProduct.Id, Item.RecordId, ItemIsBlockedLbl, Shop);
                         exit;
                     end;
             end;

Apps/W1/Shopify/app/src/Shipping/Codeunits/ShpfyExportShipments.Codeunit.al

@@ -40,7 +40,7 @@ codeunit 30190 "Shpfy Export Shipments"
         ShopifyOrderHeader: Record "Shpfy Order Header";
         OrderFulfillments: Codeunit "Shpfy Order Fulfillments";
         JsonHelper: Codeunit "Shpfy Json Helper";
-        SkipRecordMgt: Codeunit "Shpfy Skip Record Mgt.";
+        SkipRecordMgt: Codeunit "Shpfy Skip Record";
         JFulfillment: JsonToken;
         JResponse: JsonToken;
         FulfillmentOrderRequest: Text;

Apps/W1/Shopify/app/src/Shipping/Reports/ShpfySyncShipmToShopify.Report.al

@@ -31,7 +31,7 @@ report 30109 "Shpfy Sync Shipm. to Shopify"
                 ShopifyOrderHeader: Record "Shpfy Order Header";
                 ShipmentLine: Record "Sales Shipment Line";
                 Shop: Record "Shpfy Shop";
-                SkipRecordMgt: Codeunit "Shpfy Skip Record Mgt.";
+                SkipRecordMgt: Codeunit "Shpfy Skip Record";
                 NoLinesApplicableLbl: Label 'No lines applicable for fulfillment.';
                 ShopifyOrderNotExistsLbl: Label 'Shopify order %1 does not exist.', Comment = '%1 = Shopify Order Id';
             begin

Apps/W1/Shopify/test/Logs/ShpfySkippedRecordLogTest.Codeunit.al

@@ -169,7 +169,7 @@ codeunit 139581 "Shpfy Skipped Record Log Test"
         // [SCENARIO] Skip shopify variant price calculation using item unit of measure for variant with blocked item.
         Initialize();
 
-        // [GIVEN] Blocked and sales blokced item
+        // [GIVEN] Blocked or sales blokced item
         CreateBlockedItem(Item);
         // [GIVEN] Shopify Product
         CreateShpfyProduct(ShopifyProduct, Item.SystemId, Shop.Code, ShopifyVariant);
@@ -183,7 +183,7 @@ codeunit 139581 "Shpfy Skipped Record Log Test"
         ShpfySkippedRecord.SetRange("Record ID", Item.RecordId);
         ShpfySkippedRecord.SetRange("Shopify Id", ShopifyVariant.Id);
         LibraryAssert.IsTrue(ShpfySkippedRecord.FindFirst(), 'Skipped record is not created');
-        LibraryAssert.AreEqual('Variant price is not synchronized because the item is blocked and sales blocked.', ShpfySkippedRecord."Skipped Reason", 'Skipped reason is not as expected');
+        LibraryAssert.AreEqual('Variant price is not synchronized because the item is blocked or sales blocked.', ShpfySkippedRecord."Skipped Reason", 'Skipped reason is not as expected');
     end;
 
     [Test]
@@ -199,7 +199,7 @@ codeunit 139581 "Shpfy Skipped Record Log Test"
         // [SCENARIO] Skip shopify variant price calculation using item variant for variant with blocked item.
         Initialize();
 
-        // [GIVEN] Blocked and sales blokced item
+        // [GIVEN] Blocked or sales blokced item
         CreateBlockedItem(Item);
         // [GIVEN] Shopify Product
         CreateShpfyProduct(ShopifyProduct, Item.SystemId, Shop.Code, ShopifyVariant);
@@ -213,7 +213,7 @@ codeunit 139581 "Shpfy Skipped Record Log Test"
         ShpfySkippedRecord.SetRange("Record ID", Item.RecordId);
         ShpfySkippedRecord.SetRange("Shopify Id", ShopifyVariant.Id);
         LibraryAssert.IsTrue(ShpfySkippedRecord.FindFirst(), 'Skipped record is not created');
-        LibraryAssert.AreEqual('Variant price is not synchronized because the item is blocked and sales blocked.', ShpfySkippedRecord."Skipped Reason", 'Skipped reason is not as expected');
+        LibraryAssert.AreEqual('Variant price is not synchronized because the item is blocked or sales blocked.', ShpfySkippedRecord."Skipped Reason", 'Skipped reason is not as expected');
     end;
 
     [Test]
@@ -230,7 +230,7 @@ codeunit 139581 "Shpfy Skipped Record Log Test"
         // [SCENARIO] Skip shopify variant price calculation using item unit of measure and item variant for variant with blocked item.
         Initialize();
 
-        // [GIVEN] Blocked and sales blokced item
+        // [GIVEN] Blocked or sales blokced item
         CreateBlockedItem(Item);
         // [GIVEN] Shopify Product
         CreateShpfyProduct(ShopifyProduct, Item.SystemId, Shop.Code, ShopifyVariant);
@@ -244,7 +244,7 @@ codeunit 139581 "Shpfy Skipped Record Log Test"
         ShpfySkippedRecord.SetRange("Record ID", Item.RecordId);
         ShpfySkippedRecord.SetRange("Shopify Id", ShopifyVariant.Id);
         LibraryAssert.IsTrue(ShpfySkippedRecord.FindFirst(), 'Skipped record is not created');
-        LibraryAssert.AreEqual('Variant price is not synchronized because the item is blocked and sales blocked.', ShpfySkippedRecord."Skipped Reason", 'Skipped reason is not as expected');
+        LibraryAssert.AreEqual('Variant price is not synchronized because the item is blocked or sales blocked.', ShpfySkippedRecord."Skipped Reason", 'Skipped reason is not as expected');
     end;
 
     [Test]
@@ -590,7 +590,7 @@ codeunit 139581 "Shpfy Skipped Record Log Test"
     var
         ShopWithDisabledLogging: Record "Shpfy Shop";
         SkippedRecord: Record "Shpfy Skipped Record";
-        SkipRecordMgt: Codeunit "Shpfy Skip Record Mgt.";
+        SkipRecordMgt: Codeunit "Shpfy Skip Record";
         RecordID: RecordID;
         ShopifyId: BigInteger;
         TableId: Integer;