oddb2xml 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be613b5666463eb06459f7f21d24a4c0942178ebd96610d134e890d138a3d582
-  data.tar.gz: ca8cb89b1de25a375aaffe013f7e46c4fafe0a9b87beefa9eca6e6575b2a0bb9
+  metadata.gz: ef2f6995fe6bb0c2a270a41f12322b1796a3d544a579175bb4906072560fcbf6
+  data.tar.gz: '052907769a7933ee5e968f0d023b43f698b218df4e5f9907d56081b04cc8d7cf'
 SHA512:
-  metadata.gz: d3b03befd32d4c382b6135a6ab61a5f69e87a0840b4836bcb664e71fcc9e892276db9fc6fd5fff27377076a792ee5c72692ab83c1d61e7aa0b5796c26fbc7c15
-  data.tar.gz: 60acf84e26c7251dc7d3d1b822d41d06933672cdf4292f66ff3e183365f369a6a5cb81d8d14a95636aaf3234224b12b2a2e1133f5c68b7d399a0d8384cd2a03e
+  metadata.gz: 18faa95d729dd10b602a305a56bede4fe0f9b2943c1531f0fb4fdc951a50d712ba45fba69d381bd070f7fda45913fa79befa7f00cd03cb553bf815a8fead7677
+  data.tar.gz: db215dfc9458e45bdb6be130a156b30e12a8f500906014243a01153e5dcbe4b0503102682d4be0164a7b45d68902b8300b33189d9c6776b9dff79673f6621ce4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.9.0)
+    oddb2xml (2.9.1)
       htmlentities
       httpi
       mechanize

data/lib/oddb2xml/builder.rb

@@ -1031,10 +1031,12 @@ module Oddb2xml
                 xml.SYN1F obj[:seq][:name_fr] unless obj[:seq][:name_fr].empty?
               end
               if obj[:seq]
-                case obj[:seq][:deductible]
-                when "Y" then xml.SLOPLUS 1; # 20%
-                when "N" then xml.SLOPLUS 2; # 10%
-                else xml.SLOPLUS "" # k.A.
+                if obj[:seq][:deductible] == "Y" || obj[:seq][:deductible20] == "Y"
+                  xml.SLOPLUS 1; # 40%
+                elsif obj[:seq][:deductible] == "N" || obj[:seq][:deductible20] == "N"
+                  xml.SLOPLUS 2; # 10%
+                else
+                  xml.SLOPLUS "" # k.A.
                 end
               end
               # xml.NOPCS
@@ -1656,7 +1658,7 @@ module Oddb2xml
                     # TODO: Delete deductible20 after 2024/03/01
                     # https://github.com/zdavatz/oddb2xml/issues/81
                     case item[:deductible20]
-                      when "Y" then xml.DEDUCTIBLE 40; # 20%
+                      when "Y" then xml.DEDUCTIBLE 40; # 40%
                       when "N" then xml.DEDUCTIBLE 10; # 10%
                     end
                   end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.9.0"
+  VERSION = "2.9.1"
 end

data/oddb2xml.xsd

@@ -11,7 +11,7 @@
       Under http://dev.ywesee.com/Main/Oddb2xml you find more information on how the data is generated.
 
       In this XSD file we refer to the following sources:
-      # swissINDEX 
+      # swissINDEX
       ## Pharma: https://index.ws.e-mediat.net/Swissindex/Pharma/ws_Pharma_V101.asmx?WSDL"
       ## NonPharma https://index.ws.e-mediat.net/Swissindex/NonPharma/ws_NonPharma_V101.asmx?WSDL"
       # Preparations.xml
@@ -42,7 +42,7 @@
       PHAR  Pharmacode: Taken from swissINDEX or ZurRose characters 3..9
       PEXF  Price Ex-Factory (exkl. VAT):  Taken from the ZurRose.dat characters 60..65
       PPUB  Public Price (inkl. VAT):      Taken from the ZurRose.dat characters 66..71
-      SLOPLUS Selbsbehalt/deductilbe, where 1 =>  20%, 2 => 10%, '' => not known
+      SLOPLUS Selbsbehalt/deductilbe, where 1 =>  40%, 2 => 10%, '' => not known
       REF_DATA 1 in oddb_article if coming from a refdata source (migel, bag, swissmedic), else 0
 
       FIRST import all data from swissINDEX
@@ -88,7 +88,7 @@
       * Composition (column 'P') -> Field CompositionSwissmedic in oddb_product.xml
       * Packungsgrösse (column 'L') -> Field PackGrSwissmedic in oddb_article.xml
       * Packungseinheit(column 'L') -> Field EinheitSwissmedic in oddb_article.xml
-      
+
       In oddb_product.xml PRODNO must be exactly 7 digits long. For all drugs appearing in the Packungen.xlsx the
       PRODNO is defined as IKSNR (column A Zulassungsnummer) + SEQ (column b Dosisstärkenummer) and the DSCRD is
       taken vom refdata.
@@ -96,7 +96,7 @@
 
     </xs:documentation>
   </xs:annotation>
-  
+
   <xs:element name="ARTICLE">
     <xs:complexType>
       <xs:sequence>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip