pais_legacy 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12e0e5c2ae23c6478f7d42593a75b20897515677436053610143dba974f836b4
-  data.tar.gz: 6ec00f494ef30e88aa66c0f92e72ffb658d46c0fa3c1719d1847fbc400f405dd
+  metadata.gz: 8322506aeab63d91f136772bd74a92d2f61812c5140b8d08d2579047f0752ae4
+  data.tar.gz: f946642a14eeaa7391479e27d7e4501bc461a498ad613e8ebadb7b78ceede8c4
 SHA512:
-  metadata.gz: cbe84118bf32e6939f3caff7f29296e1679c5a1b6a4eefb5a1328a89e205fb70cec5afe0f9cee10626ba294e8cf21231c28c07c44b641e241acbc18c79570f2d
-  data.tar.gz: cbc9141589838e1b65d1fc52ae1d53c2f2f57ee1b89af8dea48467609ee94ccd1a8f4b88e1583eb2cb737184ce65a5feb92a49b0ebca4544fd41de6c3d6b9c3b
+  metadata.gz: f60cb73e9370a79a644b5db148986fe75e47e2e9b9ab1d72f290981def78a6a89483b3f0343bef2d1264ade107a38f4a21976c03e0e2512c3f91fe3c1b7b3b6d
+  data.tar.gz: fb60b1f5decdfb688fc1ea01838c1dab60b2000fb161fd0af3571e79bbee9d6cc17b3f0d991ca23f3eedc30f0610afcb9741876c9b9d1772aca168437b9f1669

data/lib/pais_legacy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PaisLegacy
-  VERSION = "2.2.0"
+  VERSION = "2.3.1"
 end

data/lib/pais_legacy.rb

@@ -184,20 +184,32 @@ module PaisLegacy
     # --------------------------------------------------------------------------------
     # General Journals
     # --------------------------------------------------------------------------------
-    def self.save_journals(ledger, data)
-      File.open(journals_file(ledger), "w") do |f|
+    #
+    # data should be the whole params, which will include the pais_code, dr & cr amounts
+    #
+    def self.save_journals(ledger_code, data)
+      tranno=Pais.lasttrnno_read(ledger_code).to_i 
+
+      File.open(journals_file(ledger_code), "w") do |f|
         f.write "AutoPost,LastTrnNo,Date,DR,DR_SUB,CR,CR_SUB,Description,Amount\n"
 
-        data[:xero].each_with_index do |xero,i|
-          # Determine if it's a credit/debit transaction
-          if (amount = data[:dr][i].to_f) > 0
-            dr_account,dr_sub,cr_account = accounts(data[:pais][i])
-          else
-            cr_account,cr_sub,dr_account = accounts(data[:pais][i])
-            amount = data[:cr][i]
+        data[:dr].each_with_index do |d,i|
+          if data[:pais][i]
+            
+            # Determine if it's a credit/debit transaction
+            if (amount = data[:dr][i].to_f) > 0
+              dr_account,dr_sub,cr_account = accounts(data[:pais][i])
+            else
+              cr_account,cr_sub,dr_account = accounts(data[:pais][i])
+              amount = data[:cr][i]
+            end
+
+            tranno += 1
+            date = data[:date_to].nil? ? Time.now : Date.parse(data[:date_to])
+            date = date.strftime("%d/%m/%Y")
+            
+            f.write "GJ,#{tranno},#{date},#{dr_account},#{dr_sub},#{cr_account},#{cr_sub},#{description(data,i)},#{amount}\n"
           end
-
-          f.write "GJ,#{Pais.lasttrnno_read(ledger).to_i + 1 + i},#{Time.now.strftime("%d/%m/%Y")},#{dr_account},#{dr_sub},#{cr_account},#{cr_sub},#{description(data,i)},#{amount}\n"
         end
       end
     end
@@ -285,15 +297,16 @@ module PaisLegacy
       out
     end
 
-    def legacy_import_invoice(ledger,date,inv_no)
+    def legacy_import_invoice(ledger,date,inv_no,client)
 
       date = Date.parse(date).strftime("%d/%m/%Y")
 
-      cmd=PaisLegacy::Pais.ssh + ' "bash -c \"' + PaisLegacy::Pais.fglgo("invo_read") + ' {{ccode}} {{ledger}} {{date}} {{inv_no}}\""'
+      cmd=PaisLegacy::Pais.ssh + ' "bash -c \"' + PaisLegacy::Pais.fglgo("invo_read") + ' {{ccode}} {{ledger}} {{date}} {{inv_no}} {{client}}\""'
         .gsub("{{ccode}}","T1")
         .gsub("{{ledger}}",ledger.to_s)
         .gsub("{{date}}",date)
         .gsub("{{inv_no}}",inv_no)
+        .gsub("{{client}}",client)
 
       puts cmd
       out,_,_=Open3.capture2(cmd)
@@ -403,9 +416,15 @@ module PaisLegacy
     end
 
     def self.description(data,i)
-      xero_description=data[:xero_name][i].gsub(",","_")
       pais_account = data[:pais][i]
-      "Auto post (Xero #{xero_description} -> #{pais_account})"
+
+      if data[:xero_name]
+        desc=data[:xero_name][i].gsub(",","_")
+        return "Auto post (Xero #{desc} -> #{pais_account})"
+      else
+        desc=data[:qb_name][i].gsub(",","_")
+        return "Auto post (QB #{desc} -> #{pais_account})"
+      end
     end
 
     def self.journals_file(ledger)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pais_legacy
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Michael Pope
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: PAIS Legacy API Wrapper