From c3835d5eb6400534c27fac2a2a512da60d22681a Mon Sep 17 00:00:00 2001 From: Michael Peters Date: Thu, 15 Mar 2012 14:11:48 -0400 Subject: [PATCH] PO JEDI Template use SAN instead of Code to identify vendor Some libraries may run into issues with the action/trigger (PO JEDI). The template has to be modified to handle different vendor codes that may be used. For instance, if you use "ingra" instead of INGRAM this may cause a problem because they are hardcoded in the template. This is, in my opinion, a better way of identifying the vendor. Signed-off-by: Michael Peters --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 21 +++++++++++---------- .../src/sql/Pg/upgrade/0433.edi_orders_template.sql | 7 ++++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 86ad4f6b77..16752256db 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -7911,16 +7911,17 @@ END; "po_number":[% target.id %], "date":"[% date.format(date.now, '%Y%m%d') %]", "buyer":[ - [% IF target.provider.edi_default.vendcode && (target.provider.code == 'BT' || target.provider.name.match('(?i)^BAKER & TAYLOR')) -%] - {"id-qualifier": 91, "id":"[% target.ordering_agency.mailing_address.san _ ' ' _ target.provider.edi_default.vendcode %]"} - [%- ELSIF target.provider.edi_default.vendcode && target.provider.code == 'INGRAM' -%] - {"id":"[% target.ordering_agency.mailing_address.san %]"}, - {"id-qualifier": 91, "id":"[% target.provider.edi_default.vendcode %]"} - [%- ELSE -%] - {"id":"[% target.ordering_agency.mailing_address.san %]"} - [%- END -%] - ], - "vendor":[ + [% IF target.provider.edi_default.vendcode && (target.provider.san == '1556150') -%] + {"id-qualifier": 91, "id":"[% target.ordering_agency.mailing_address.san _ ' ' _ target.provider.edi_default.vendcode %]"} + {"id-qualifier": 91, "id":"[% target.ordering_agency.mailing_address.san _ ' ' _ target.provider.edi_default.vendcode %]"} + [%- ELSIF target.provider.edi_default.vendcode && (target.provider.san == '1697978') -%] + {"id":"[% target.ordering_agency.mailing_address.san %]"}, + {"id-qualifier": 91, "id":"[% target.provider.edi_default.vendcode %]"} + [%- ELSE -%] + {"id":"[% target.ordering_agency.mailing_address.san %]"} + [%- END -%] + ], + "vendor":[ [%- # target.provider.name (target.provider.id) -%] "[% target.provider.san %]", {"id-qualifier": 92, "id":"[% target.provider.id %]"} diff --git a/Open-ILS/src/sql/Pg/upgrade/0433.edi_orders_template.sql b/Open-ILS/src/sql/Pg/upgrade/0433.edi_orders_template.sql index 0aec927adb..14a55f5f86 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0433.edi_orders_template.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0433.edi_orders_template.sql @@ -24,16 +24,17 @@ END; "po_number":[% target.id %], "date":"[% date.format(date.now, '%Y%m%d') %]", "buyer":[ - [% IF target.provider.edi_default.vendcode && (target.provider.code == 'BT' || target.provider.name.match('(?i)^BAKER & TAYLOR')) -%] + [% IF target.provider.edi_default.vendcode && (target.provider.san == '1556150') -%] {"id-qualifier": 91, "id":"[% target.ordering_agency.mailing_address.san _ ' ' _ target.provider.edi_default.vendcode %]"} - [%- ELSIF target.provider.edi_default.vendcode && target.provider.code == 'INGRAM' -%] + {"id-qualifier": 91, "id":"[% target.ordering_agency.mailing_address.san _ ' ' _ target.provider.edi_default.vendcode %]"} + [%- ELSIF target.provider.edi_default.vendcode && (target.provider.san == '1697978') -%] {"id":"[% target.ordering_agency.mailing_address.san %]"}, {"id-qualifier": 91, "id":"[% target.provider.edi_default.vendcode %]"} [%- ELSE -%] {"id":"[% target.ordering_agency.mailing_address.san %]"} [%- END -%] ], - "vendor":[ + "vendor":[ [%- # target.provider.name (target.provider.id) -%] "[% target.provider.san %]", {"id-qualifier": 92, "id":"[% target.provider.id %]"} -- 2.11.0