Merge pull request #23 from cloudlogistics/revert-22-BUGS-6353_fix_40…

…10_310_grammar Revert "BUGS-6353 Fix incorrect 4010 310 grammar"
cloudlogistics · Mar 1, 2018 · 42ca922 · 42ca922
2 parents 84fa733 + 187c7ea
commit 42ca922
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 17 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    baldr (0.10.5)
+    baldr (0.10.4)
       activesupport
 
 GEM
@@ -18,7 +18,7 @@ GEM
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     method_source (0.8.2)
-    minitest (5.11.1)
+    minitest (5.10.3)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)

diff --git a/lib/baldr/grammar/version4010/set310.rb b/lib/baldr/grammar/version4010/set310.rb
@@ -34,15 +34,14 @@ def record_defs
           {id: 'QTY', min: 0, max: 1},
           {id: 'M7', min: 0, max: 5}
         ]},
-        {id: 'L0', min: 0, max: 120, level:[
-          {id: 'L5', min: 0, max: 9999}
-        ]},
-        {id: 'L1', min: 0, max: 20, level:[
-          {id: 'C3', min: 0, max: 1}
-        ]}
+       {id: 'L0', min: 0, max: 120, level:[
+         {id: 'L5', min: 0, max: 9999},
+       ]},
       ]},
       {id: 'L3', min: 1, max: 1},
-      {id: 'SE', min: 1, max: 1}
+      {id: 'L1', min: 0, max: 20},
+      {id: 'C3', min: 0, max: 1},
+      {id: 'SE', min: 1, max: 1},
     ]
   }.freeze
 end
diff --git a/lib/baldr/version.rb b/lib/baldr/version.rb
@@ -1,3 +1,3 @@
 module Baldr
-  VERSION = '0.10.5'
+  VERSION = '0.10.4'
 end
diff --git a/spec/support/edi_files/valid/310/1.EDI b/spec/support/edi_files/valid/310/1.EDI
@@ -45,6 +45,7 @@ M7~UL-9056210
 N7~TRIU~823600~13288000~G~~~~50000~X~~~~~~~~K~0~~~~40RT
 M7~UL-9043794
 L0~1~~~13288~G~50~X~2782~EAC~~K
+L3~79081~G~~~~~2849500~~300~X~16579~K
 L1~1~1~PS~~~2610000~~~~~P~EXPORT OCEAN FREIGHT~~~~~~~~USD
 L1~2~~~~~145200~~~~~P~BAF/EBAF~~~~~~~~USD
 L1~3~~~~~54000~~~~~P~LOW SULPHUR FUEL CHARGE~~~~~~~~USD
@@ -54,7 +55,6 @@ L1~6~~~~~3500~~~~~P~ICS ENS FILING~~~~~~~~USD
 L1~7~~~~~9500~~~~~P~FORWARDING FEE~~~~~~~~USD
 L1~8~~~~~1500~~~~~P~AES/EEI FILING FEE~~~~~~~~USD
 L1~9~~~~~15000~~~~~P~VGM FEE~~~~~~~~USD
-L3~79081~G~~~~~2849500~~300~X~16579~K
 SE~55~20320001
 GE~1~2032
 IEA~1~000002032
diff --git a/spec/support/edi_files/valid/310/k_and_n_TULM254246.EDI b/spec/support/edi_files/valid/310/k_and_n_TULM254246.EDI
@@ -19,6 +19,7 @@ H3*FCL
 LX*1
 N7*NYKU*NYKU070198*********************40HC
 L0*1***1035*G*20.52*X*1*CTN
+L3*1035*B***372500******1*K
 L1*1***14000****151****Cartage & Arranging
 L1*2***5000****300****Export Customs Clearance
 L1*3***3500****201****B/L Fee Export
@@ -29,7 +30,6 @@ L1*7***223000****550****Seafreight
 L1*8***77500****800****Import Drayage (Haulage)
 L1*9***9000****830****Chassis Rental Fee Import
 C3*USD
-L3*1035*B***372500******1*K
 SE*31*0001
 GE*1*1014
 IEA*1*000001014
diff --git a/spec/support/edi_files/valid/310/k_and_n_TULM261612.EDI b/spec/support/edi_files/valid/310/k_and_n_TULM261612.EDI
@@ -22,6 +22,7 @@ LX*1
 N7*UESU*UESU432973*********************40GE
 N7*TRKU*TRKU403749*********************40GE
 L0*1***5480*G*100*X*2*CTN
+L3*5480*B***1379708******2*K
 L1*1***8000****201****B/L Fee Export
 L1*2***756000****550****Seafreight
 L1*3***45968****813****Fuel Charge Oncarriage
@@ -30,7 +31,6 @@ L1*5***74000****800****Import Drayage (Haulage)
 L1*6***419740****802****Delivery
 L1*7***10000****830****Chassis Rental Fee Import
 C3*USD
-L3*5480*B***1379708******2*K
 SE*32*0001
 GE*1*1013
 IEA*1*000001013
diff --git a/spec/support/edi_files/valid/310/k_and_n_TULM310647.EDI b/spec/support/edi_files/valid/310/k_and_n_TULM310647.EDI
@@ -31,6 +31,7 @@ LX*1
 N7*TLLU*TLLU460040*1150*G*******40********63****40HC
 L0*1***1150*G*22.8*X*1*PCS
 L5*1*CONTAINER SAID TO CONTAIN
+L3*1150*B***372500******1*K
 L1*1***14000****151****Cartage & Arranging
 L1*2***5000****300****Export Customs Clearance
 L1*3***3500****201****B/L Fee Export
@@ -40,7 +41,6 @@ L1*6***29000****406****Container Stuffing Export
 L1*7***223000****550****Seafreight
 L1*8***77500****800****Import Drayage (Haulage)
 L1*9***9000****830****Chassis Rental Fee Import
-L3*1150*B***372500******1*K
 SE*42*0001
 GE*1*20
 IEA*1*000000020
diff --git a/spec/support/edi_files/valid/310/k_and_n_TULM310986.EDI b/spec/support/edi_files/valid/310/k_and_n_TULM310986.EDI
@@ -32,6 +32,7 @@ LX*1
 N7*MOTU*MOTU672484*410*G***************61
 L0*1***410*G*4.6*X*10*PCS
 L5*1*B777/GE90-Blocker Door
+L3*410*B***138516******10*K
 L1*1***1380****074****Peak Hour Traffic Mitigat
 L1*2***19500****165****Pick-up Charges
 L1*3***1380****187****Clean Truck Fee (CTF) Exp
@@ -48,7 +49,6 @@ L1*13***2500****641****Port Security Fee Import
 L1*14***3500****604****Service Fee Import
 L1*15***9200****808****Loading of Truck
 L1*16***920****830****Chassis Rental Fee Import
-L3*410*B***138516******10*K
 SE*50*0001
 GE*1*22
 IEA*1*000000022
diff --git a/spec/support/edi_files/valid/310/k_and_n_TULM310996.EDI b/spec/support/edi_files/valid/310/k_and_n_TULM310996.EDI
@@ -32,6 +32,7 @@ LX*1
 N7*MOTU*MOTU672484*3.5*G***************61
 L0*1***3.5*G*0.04*X*1*PCS
 L5*1*B747/767 BLOCKER DOOR
+L3*3.5*B***91638******1*K
 L1*1***12****074****Peak Hour Traffic Mitigat
 L1*2***19500****165****Pick-up Charges
 L1*3***12****187****Clean Truck Fee (CTF) Exp
@@ -48,7 +49,6 @@ L1*13***2500****641****Port Security Fee Import
 L1*14***3500****604****Service Fee Import
 L1*15***7000****808****Loading of Truck
 L1*16***8****830****Chassis Rental Fee Import
-L3*3.5*B***91638******1*K
 SE*50*0001
 GE*1*23
 IEA*1*000000023
diff --git a/spec/support/edi_files/valid/310/k_and_n_TULM319958.EDI b/spec/support/edi_files/valid/310/k_and_n_TULM319958.EDI
@@ -33,6 +33,7 @@ LX*1
 N7*YMLU*YMLU876622*136*G*******40********61****40HC
 L0*1***136*G*1.631*X*1*PCS
 L5*1*SAID TO CONTAIN
+L3*136*B***110130******1*K
 L1*1***27500****165****Pick-up Charges
 L1*2***5000****300****Export Customs Clearance
 L1*3***7500****201****B/L Fee Export
@@ -46,7 +47,6 @@ L1*10***2500****641****Port Security Fee Import
 L1*11***8500****658****CFS Charge (Import)
 L1*12***3500****604****Service Fee Import
 L1*13***326****830****Chassis Rental Fee Import
-L3*136*B***110130******1*K
 SE*48*0001
 GE*1*21
 IEA*1*000000021