pais_legacy 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b355300b6891c6c5ccdfbe802192224ba7171a1314696429bef0ec1b4723e94
-  data.tar.gz: 35d5798564db5fd79fee8e17ef8e3670a2e20eaf6bbe9cbb516d42f0d680d45e
+  metadata.gz: 80d3bf298ea14b2a10e1c6836fe75114ca064483b4cc036d53e865de2ef2f6b7
+  data.tar.gz: 6c6e5b411054963d38f348dd3398ce46499dbe66ad3264d0c9404213829c89ea
 SHA512:
-  metadata.gz: 1a188ed4744bdfbc2e757fa066bd46fccba0febc74ff673362d248ecd9c5fe0269f58de36af44afde7857a698fb31fb5e07caebfd30088a0ea95f056b8342b32
-  data.tar.gz: b6b1347dffee8ec977261c52fe19dfbbde73e9c3beed2462950e5951b44b46f8ee3d04d304cf71b7b37fb01b00b6205976deb493e3eb2dfecffab7579d40f7b1
+  metadata.gz: 41d422b278734b5659d236993035d608256a7ff10b7a097304c9ce71cdde95cf764feace2755eed1d4cadc8a6c9a87b5ba1bc7343b8afba394380ec83a027146
+  data.tar.gz: 3b4a88414f785148322d1fae0436fb5319210c1f388e8b7256e262be96e3db4cc6d25481c174cea9572fa052e556650761b8a5cf204cfd85cf37c33e5966bd57

data/lib/pais_legacy/version.rb

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

data/lib/pais_legacy.rb

@@ -15,7 +15,8 @@ module PaisLegacy
     SERVER="192.168.200.4"
     SUSPENSE_ACCOUNT=1599
     CLEARING_ACCOUNT=5199
-
+    TB_DIRECT_ACCOUNT=8999
+    
     # --------------------------------------------------------------------------------
     # Client
     # --------------------------------------------------------------------------------
@@ -184,20 +185,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
@@ -394,7 +407,7 @@ module PaisLegacy
     private
     def self.accounts(account)
       account = account.split("/")
-      acc = account[0] ? account[0] : SUSPENSE_ACCOUNT
+      acc = account[0] ? account[0] : TB_DIRECT_ACCOUNT
       sub=account[1] if account.count > 1
       return acc,sub,CLEARING_ACCOUNT
     end
@@ -404,9 +417,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.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Michael Pope
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug