svn commit: r1761194 - in /ofbiz/branches: release14.12/ release14.12/framework/common/
Locked
svn commit: r1761194 - in /ofbiz/branches: release14.12/ release14.12/framework/common/
 
|
Author: jleroux
Date: Sat Sep 17 11:04:14 2016 New Revision: 1761194 URL: http://svn.apache.org/viewvc?rev=1761194&view=rev Log: "Applied fix from trunk for revision: 1760406" (tree conflicts handled by hand) ------------------------------------------------------------------------ r1760406 | jleroux | 2016-09-12 18:47:53 +0200 (lun. 12 sept. 2016) | 10 lignes Fixes: Display of State/Province for non US entities in the customer's profile of ecommerce (OFBIZ-8231) When I access url https://localhost:8443/ecommerce/control/viewprofile for my profile, State/Province display in addresses shows the geo-id, which is fine for US entities where the GeoID is the state code, but for non-us entities, the GeoID is often something like CountryCode-StateCode, which isn't very nice. Thanks: fumiyoshi.to for report and patch jleroux: I have slightly changed the patch for 2 reasons: * check for null exceptions * use not deprecated version of getRelatedOne() ------------------------------------------------------------------------ Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/framework/common/data/GeoData_JP.xml ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/framework/common/data/GeoData_JP.xml ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 17 11:04:14 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 /ofbiz/branches/release15.12:1745714,1746426,1757966,1758998,1759028 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759005,1759014,1759024,1759678,1759941,1761127,1761170,1761179 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179 Modified: ofbiz/branches/release14.12/framework/common/data/GeoData_JP.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/data/GeoData_JP.xml?rev=1761194&r1=1761193&r2=1761194&view=diff ============================================================================== --- ofbiz/branches/release14.12/framework/common/data/GeoData_JP.xml (original) +++ ofbiz/branches/release14.12/framework/common/data/GeoData_JP.xml Sat Sep 17 11:04:14 2016 @@ -20,53 +20,53 @@ under the License. <entity-engine-xml> - <Geo abbreviation="01" geoCode="01" geoId="JP-01" geoName="åæµ·é" geoTypeId="PROVINCE" wellKnownText="Hokkaido"/> - <Geo abbreviation="02" geoCode="02" geoId="JP-02" geoName="é森ç" geoTypeId="PROVINCE" wellKnownText="Aomori"/> - <Geo abbreviation="03" geoCode="03" geoId="JP-03" geoName="岩æç" geoTypeId="PROVINCE" wellKnownText="Iwate"/> - <Geo abbreviation="04" geoCode="04" geoId="JP-04" geoName="å®®åç" geoTypeId="PROVINCE" wellKnownText="Miyagi"/> - <Geo abbreviation="05" geoCode="05" geoId="JP-05" geoName="ç§ç°ç" geoTypeId="PROVINCE" wellKnownText="Akita"/> - <Geo abbreviation="06" geoCode="06" geoId="JP-06" geoName="山形ç" geoTypeId="PROVINCE" wellKnownText="Yamagata"/> - <Geo abbreviation="07" geoCode="07" geoId="JP-07" geoName="ç¦å³¶ç" geoTypeId="PROVINCE" wellKnownText="Fukushima"/> - <Geo abbreviation="08" geoCode="08" geoId="JP-08" geoName="è¨åç" geoTypeId="PROVINCE" wellKnownText="Ibaraki"/> - <Geo abbreviation="09" geoCode="09" geoId="JP-09" geoName="æ æ¨ç" geoTypeId="PROVINCE" wellKnownText="Tochigi"/> - <Geo abbreviation="10" geoCode="10" geoId="JP-10" geoName="群馬ç" geoTypeId="PROVINCE" wellKnownText="Gunma"/> - <Geo abbreviation="11" geoCode="11" geoId="JP-11" geoName="å¼çç" geoTypeId="PROVINCE" wellKnownText="Saitama"/> - <Geo abbreviation="12" geoCode="12" geoId="JP-12" geoName="åèç" geoTypeId="PROVINCE" wellKnownText="Chiba"/> - <Geo abbreviation="13" geoCode="13" geoId="JP-13" geoName="æ±äº¬é½" geoTypeId="PROVINCE" wellKnownText="Tokyo"/> - <Geo abbreviation="14" geoCode="14" geoId="JP-14" geoName="ç¥å¥å·ç" geoTypeId="PROVINCE" wellKnownText="Kanagawa"/> - <Geo abbreviation="15" geoCode="15" geoId="JP-15" geoName="æ°æ½ç" geoTypeId="PROVINCE" wellKnownText="Niigata"/> - <Geo abbreviation="16" geoCode="16" geoId="JP-16" geoName="å¯å±±ç" geoTypeId="PROVINCE" wellKnownText="Toyama"/> - <Geo abbreviation="17" geoCode="17" geoId="JP-17" geoName="ç³å·ç" geoTypeId="PROVINCE" wellKnownText="Ishikawa"/> - <Geo abbreviation="18" geoCode="18" geoId="JP-18" geoName="ç¦äºç" geoTypeId="PROVINCE" wellKnownText="Fukui"/> - <Geo abbreviation="19" geoCode="19" geoId="JP-19" geoName="山梨ç" geoTypeId="PROVINCE" wellKnownText="Yamanashi"/> - <Geo abbreviation="20" geoCode="20" geoId="JP-20" geoName="é·éç" geoTypeId="PROVINCE" wellKnownText="Nagano"/> - <Geo abbreviation="21" geoCode="21" geoId="JP-21" geoName="å²éç" geoTypeId="PROVINCE" wellKnownText="Gifu"/> - <Geo abbreviation="22" geoCode="22" geoId="JP-22" geoName="é岡ç" geoTypeId="PROVINCE" wellKnownText="Shizuoka"/> - <Geo abbreviation="23" geoCode="23" geoId="JP-23" geoName="æç¥ç" geoTypeId="PROVINCE" wellKnownText="Aichi"/> - <Geo abbreviation="24" geoCode="24" geoId="JP-24" geoName="ä¸éç" geoTypeId="PROVINCE" wellKnownText="Mie"/> - <Geo abbreviation="25" geoCode="25" geoId="JP-25" geoName="æ»è³ç" geoTypeId="PROVINCE" wellKnownText="Shiga"/> - <Geo abbreviation="26" geoCode="26" geoId="JP-26" geoName="京é½åº" geoTypeId="PROVINCE" wellKnownText="Kyoto"/> - <Geo abbreviation="27" geoCode="27" geoId="JP-27" geoName="大éªåº" geoTypeId="PROVINCE" wellKnownText="Osaka"/> - <Geo abbreviation="28" geoCode="28" geoId="JP-28" geoName="å µåº«ç" geoTypeId="PROVINCE" wellKnownText="Hyogo"/> - <Geo abbreviation="29" geoCode="29" geoId="JP-29" geoName="å¥è¯ç" geoTypeId="PROVINCE" wellKnownText="Nara"/> - <Geo abbreviation="30" geoCode="30" geoId="JP-30" geoName="åæå±±ç" geoTypeId="PROVINCE" wellKnownText="Wakayama"/> - <Geo abbreviation="31" geoCode="31" geoId="JP-31" geoName="é³¥åç" geoTypeId="PROVINCE" wellKnownText="Tottori"/> - <Geo abbreviation="32" geoCode="32" geoId="JP-32" geoName="å³¶æ ¹ç" geoTypeId="PROVINCE" wellKnownText="Shimane"/> - <Geo abbreviation="33" geoCode="33" geoId="JP-33" geoName="岡山ç" geoTypeId="PROVINCE" wellKnownText="Okayama"/> - <Geo abbreviation="34" geoCode="34" geoId="JP-34" geoName="åºå³¶ç" geoTypeId="PROVINCE" wellKnownText="Hiroshima"/> - <Geo abbreviation="35" geoCode="35" geoId="JP-35" geoName="å±±å£ç" geoTypeId="PROVINCE" wellKnownText="Yamaguchi"/> - <Geo abbreviation="36" geoCode="36" geoId="JP-36" geoName="徳島ç" geoTypeId="PROVINCE" wellKnownText="Tokushima"/> - <Geo abbreviation="37" geoCode="37" geoId="JP-37" geoName="é¦å·ç" geoTypeId="PROVINCE" wellKnownText="Kagawa"/> - <Geo abbreviation="38" geoCode="38" geoId="JP-38" geoName="æåªç" geoTypeId="PROVINCE" wellKnownText="Ehime"/> - <Geo abbreviation="39" geoCode="39" geoId="JP-39" geoName="é«ç¥ç" geoTypeId="PROVINCE" wellKnownText="Kochi"/> - <Geo abbreviation="40" geoCode="40" geoId="JP-40" geoName="ç¦å²¡ç" geoTypeId="PROVINCE" wellKnownText="Fukuoka"/> - <Geo abbreviation="41" geoCode="41" geoId="JP-41" geoName="ä½è³ç" geoTypeId="PROVINCE" wellKnownText="Saga"/> - <Geo abbreviation="42" geoCode="42" geoId="JP-42" geoName="é·å´ç" geoTypeId="PROVINCE" wellKnownText="Nagasaki"/> - <Geo abbreviation="43" geoCode="43" geoId="JP-43" geoName="çæ¬ç" geoTypeId="PROVINCE" wellKnownText="Kumamoto"/> - <Geo abbreviation="44" geoCode="44" geoId="JP-44" geoName="大åç" geoTypeId="PROVINCE" wellKnownText="Oita"/> - <Geo abbreviation="45" geoCode="45" geoId="JP-45" geoName="å®®å´ç" geoTypeId="PROVINCE" wellKnownText="Miyazaki"/> - <Geo abbreviation="46" geoCode="46" geoId="JP-46" geoName="鹿å 島ç" geoTypeId="PROVINCE" wellKnownText="Kagoshima"/> - <Geo abbreviation="47" geoCode="47" geoId="JP-47" geoName="æ²ç¸ç" geoTypeId="PROVINCE" wellKnownText="Okinawa"/> + <Geo abbreviation="HK" geoCode="01" geoId="JP-01" geoName="åæµ·é" geoTypeId="PROVINCE" wellKnownText="Hokkaido"/> + <Geo abbreviation="AO" geoCode="02" geoId="JP-02" geoName="é森ç" geoTypeId="PROVINCE" wellKnownText="Aomori"/> + <Geo abbreviation="IT" geoCode="03" geoId="JP-03" geoName="岩æç" geoTypeId="PROVINCE" wellKnownText="Iwate"/> + <Geo abbreviation="MG" geoCode="04" geoId="JP-04" geoName="å®®åç" geoTypeId="PROVINCE" wellKnownText="Miyagi"/> + <Geo abbreviation="AK" geoCode="05" geoId="JP-05" geoName="ç§ç°ç" geoTypeId="PROVINCE" wellKnownText="Akita"/> + <Geo abbreviation="YG" geoCode="06" geoId="JP-06" geoName="山形ç" geoTypeId="PROVINCE" wellKnownText="Yamagata"/> + <Geo abbreviation="FS" geoCode="07" geoId="JP-07" geoName="ç¦å³¶ç" geoTypeId="PROVINCE" wellKnownText="Fukushima"/> + <Geo abbreviation="IB" geoCode="08" geoId="JP-08" geoName="è¨åç" geoTypeId="PROVINCE" wellKnownText="Ibaraki"/> + <Geo abbreviation="TC" geoCode="09" geoId="JP-09" geoName="æ æ¨ç" geoTypeId="PROVINCE" wellKnownText="Tochigi"/> + <Geo abbreviation="GU" geoCode="10" geoId="JP-10" geoName="群馬ç" geoTypeId="PROVINCE" wellKnownText="Gunma"/> + <Geo abbreviation="ST" geoCode="11" geoId="JP-11" geoName="å¼çç" geoTypeId="PROVINCE" wellKnownText="Saitama"/> + <Geo abbreviation="CB" geoCode="12" geoId="JP-12" geoName="åèç" geoTypeId="PROVINCE" wellKnownText="Chiba"/> + <Geo abbreviation="TY" geoCode="13" geoId="JP-13" geoName="æ±äº¬é½" geoTypeId="PROVINCE" wellKnownText="Tokyo"/> + <Geo abbreviation="KN" geoCode="14" geoId="JP-14" geoName="ç¥å¥å·ç" geoTypeId="PROVINCE" wellKnownText="Kanagawa"/> + <Geo abbreviation="NI" geoCode="15" geoId="JP-15" geoName="æ°æ½ç" geoTypeId="PROVINCE" wellKnownText="Niigata"/> + <Geo abbreviation="TM" geoCode="16" geoId="JP-16" geoName="å¯å±±ç" geoTypeId="PROVINCE" wellKnownText="Toyama"/> + <Geo abbreviation="IS" geoCode="17" geoId="JP-17" geoName="ç³å·ç" geoTypeId="PROVINCE" wellKnownText="Ishikawa"/> + <Geo abbreviation="FI" geoCode="18" geoId="JP-18" geoName="ç¦äºç" geoTypeId="PROVINCE" wellKnownText="Fukui"/> + <Geo abbreviation="YN" geoCode="19" geoId="JP-19" geoName="山梨ç" geoTypeId="PROVINCE" wellKnownText="Yamanashi"/> + <Geo abbreviation="NA" geoCode="20" geoId="JP-20" geoName="é·éç" geoTypeId="PROVINCE" wellKnownText="Nagano"/> + <Geo abbreviation="GI" geoCode="21" geoId="JP-21" geoName="å²éç" geoTypeId="PROVINCE" wellKnownText="Gifu"/> + <Geo abbreviation="SZ" geoCode="22" geoId="JP-22" geoName="é岡ç" geoTypeId="PROVINCE" wellKnownText="Shizuoka"/> + <Geo abbreviation="AI" geoCode="23" geoId="JP-23" geoName="æç¥ç" geoTypeId="PROVINCE" wellKnownText="Aichi"/> + <Geo abbreviation="ME" geoCode="24" geoId="JP-24" geoName="ä¸éç" geoTypeId="PROVINCE" wellKnownText="Mie"/> + <Geo abbreviation="SI" geoCode="25" geoId="JP-25" geoName="æ»è³ç" geoTypeId="PROVINCE" wellKnownText="Shiga"/> + <Geo abbreviation="KY" geoCode="26" geoId="JP-26" geoName="京é½åº" geoTypeId="PROVINCE" wellKnownText="Kyoto"/> + <Geo abbreviation="OS" geoCode="27" geoId="JP-27" geoName="大éªåº" geoTypeId="PROVINCE" wellKnownText="Osaka"/> + <Geo abbreviation="HG" geoCode="28" geoId="JP-28" geoName="å µåº«ç" geoTypeId="PROVINCE" wellKnownText="Hyogo"/> + <Geo abbreviation="NR" geoCode="29" geoId="JP-29" geoName="å¥è¯ç" geoTypeId="PROVINCE" wellKnownText="Nara"/> + <Geo abbreviation="WA" geoCode="30" geoId="JP-30" geoName="åæå±±ç" geoTypeId="PROVINCE" wellKnownText="Wakayama"/> + <Geo abbreviation="TT" geoCode="31" geoId="JP-31" geoName="é³¥åç" geoTypeId="PROVINCE" wellKnownText="Tottori"/> + <Geo abbreviation="SM" geoCode="32" geoId="JP-32" geoName="å³¶æ ¹ç" geoTypeId="PROVINCE" wellKnownText="Shimane"/> + <Geo abbreviation="OY" geoCode="33" geoId="JP-33" geoName="岡山ç" geoTypeId="PROVINCE" wellKnownText="Okayama"/> + <Geo abbreviation="HS" geoCode="34" geoId="JP-34" geoName="åºå³¶ç" geoTypeId="PROVINCE" wellKnownText="Hiroshima"/> + <Geo abbreviation="YA" geoCode="35" geoId="JP-35" geoName="å±±å£ç" geoTypeId="PROVINCE" wellKnownText="Yamaguchi"/> + <Geo abbreviation="TK" geoCode="36" geoId="JP-36" geoName="徳島ç" geoTypeId="PROVINCE" wellKnownText="Tokushima"/> + <Geo abbreviation="KA" geoCode="37" geoId="JP-37" geoName="é¦å·ç" geoTypeId="PROVINCE" wellKnownText="Kagawa"/> + <Geo abbreviation="EH" geoCode="38" geoId="JP-38" geoName="æåªç" geoTypeId="PROVINCE" wellKnownText="Ehime"/> + <Geo abbreviation="KO" geoCode="39" geoId="JP-39" geoName="é«ç¥ç" geoTypeId="PROVINCE" wellKnownText="Kochi"/> + <Geo abbreviation="FO" geoCode="40" geoId="JP-40" geoName="ç¦å²¡ç" geoTypeId="PROVINCE" wellKnownText="Fukuoka"/> + <Geo abbreviation="SG" geoCode="41" geoId="JP-41" geoName="ä½è³ç" geoTypeId="PROVINCE" wellKnownText="Saga"/> + <Geo abbreviation="NS" geoCode="42" geoId="JP-42" geoName="é·å´ç" geoTypeId="PROVINCE" wellKnownText="Nagasaki"/> + <Geo abbreviation="KU" geoCode="43" geoId="JP-43" geoName="çæ¬ç" geoTypeId="PROVINCE" wellKnownText="Kumamoto"/> + <Geo abbreviation="OI" geoCode="44" geoId="JP-44" geoName="大åç" geoTypeId="PROVINCE" wellKnownText="Oita"/> + <Geo abbreviation="MZ" geoCode="45" geoId="JP-45" geoName="å®®å´ç" geoTypeId="PROVINCE" wellKnownText="Miyazaki"/> + <Geo abbreviation="KG" geoCode="46" geoId="JP-46" geoName="鹿å 島ç" geoTypeId="PROVINCE" wellKnownText="Kagoshima"/> + <Geo abbreviation="OK" geoCode="47" geoId="JP-47" geoName="æ²ç¸ç" geoTypeId="PROVINCE" wellKnownText="Okinawa"/> <GeoAssoc geoId="JPN" geoIdTo="JP-01" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="JPN" geoIdTo="JP-02" geoAssocTypeId="REGIONS"/> Modified: ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy?rev=1761194&r1=1761193&r2=1761194&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy (original) +++ ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy Sat Sep 17 11:04:14 2016 @@ -86,4 +86,18 @@ if (userLogin) { partyAndContactMechList = from("PartyAndContactMech").where("partyId", partyId).orderBy("-fromDate").filterByDate().queryList(); context.partyAndContactMechList = partyAndContactMechList; + + // state/province & country's name + if (partyContactMechValueMaps) { + partyContactMechValueMaps.each { + if (it.postalAddress) { + postalAddress = it.postalAddress; + countryGeo = postalAddress.getRelatedOne("CountryGeo", false); + if (countryGeo) it.countryGeoName = countryGeo.getString("geoName"); + stateProvinceGeo = postalAddress.getRelatedOne("StateProvinceGeo", false); + if (stateProvinceGeo) it.stateProvinceGeoName = stateProvinceGeo.getString("geoName"); + + } + } + } } Modified: ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=1761194&r1=1761193&r2=1761194&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original) +++ ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sat Sep 17 11:04:14 2016 @@ -154,8 +154,8 @@ under the License. <#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if> ${postalAddress.address1}<br /> <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> - ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!} - <#if postalAddress.countryGeoId?has_content><br />${postalAddress.countryGeoId}</#if> + ${postalAddress.city}<#if partyContactMechValueMap.stateProvinceGeoName?has_content>, ${partyContactMechValueMap.stateProvinceGeoName}</#if> ${postalAddress.postalCode!} + <#if partyContactMechValueMap.countryGeoName?has_content><br />${partyContactMechValueMap.countryGeoName}</#if> <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId! = "USA")> <#assign addr1 = postalAddress.address1! /> <#if (addr1.indexOf(" ") > 0)> Propchange: ofbiz/branches/release15.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 17 11:04:14 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1761127,1761170,1761179 +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179 Modified: ofbiz/branches/release15.12/framework/common/data/GeoData_JP.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/common/data/GeoData_JP.xml?rev=1761194&r1=1761193&r2=1761194&view=diff ============================================================================== --- ofbiz/branches/release15.12/framework/common/data/GeoData_JP.xml (original) +++ ofbiz/branches/release15.12/framework/common/data/GeoData_JP.xml Sat Sep 17 11:04:14 2016 @@ -20,53 +20,53 @@ under the License. <entity-engine-xml> - <Geo abbreviation="01" geoCode="01" geoId="JP-01" geoName="åæµ·é" geoTypeId="PROVINCE" wellKnownText="Hokkaido"/> - <Geo abbreviation="02" geoCode="02" geoId="JP-02" geoName="é森ç" geoTypeId="PROVINCE" wellKnownText="Aomori"/> - <Geo abbreviation="03" geoCode="03" geoId="JP-03" geoName="岩æç" geoTypeId="PROVINCE" wellKnownText="Iwate"/> - <Geo abbreviation="04" geoCode="04" geoId="JP-04" geoName="å®®åç" geoTypeId="PROVINCE" wellKnownText="Miyagi"/> - <Geo abbreviation="05" geoCode="05" geoId="JP-05" geoName="ç§ç°ç" geoTypeId="PROVINCE" wellKnownText="Akita"/> - <Geo abbreviation="06" geoCode="06" geoId="JP-06" geoName="山形ç" geoTypeId="PROVINCE" wellKnownText="Yamagata"/> - <Geo abbreviation="07" geoCode="07" geoId="JP-07" geoName="ç¦å³¶ç" geoTypeId="PROVINCE" wellKnownText="Fukushima"/> - <Geo abbreviation="08" geoCode="08" geoId="JP-08" geoName="è¨åç" geoTypeId="PROVINCE" wellKnownText="Ibaraki"/> - <Geo abbreviation="09" geoCode="09" geoId="JP-09" geoName="æ æ¨ç" geoTypeId="PROVINCE" wellKnownText="Tochigi"/> - <Geo abbreviation="10" geoCode="10" geoId="JP-10" geoName="群馬ç" geoTypeId="PROVINCE" wellKnownText="Gunma"/> - <Geo abbreviation="11" geoCode="11" geoId="JP-11" geoName="å¼çç" geoTypeId="PROVINCE" wellKnownText="Saitama"/> - <Geo abbreviation="12" geoCode="12" geoId="JP-12" geoName="åèç" geoTypeId="PROVINCE" wellKnownText="Chiba"/> - <Geo abbreviation="13" geoCode="13" geoId="JP-13" geoName="æ±äº¬é½" geoTypeId="PROVINCE" wellKnownText="Tokyo"/> - <Geo abbreviation="14" geoCode="14" geoId="JP-14" geoName="ç¥å¥å·ç" geoTypeId="PROVINCE" wellKnownText="Kanagawa"/> - <Geo abbreviation="15" geoCode="15" geoId="JP-15" geoName="æ°æ½ç" geoTypeId="PROVINCE" wellKnownText="Niigata"/> - <Geo abbreviation="16" geoCode="16" geoId="JP-16" geoName="å¯å±±ç" geoTypeId="PROVINCE" wellKnownText="Toyama"/> - <Geo abbreviation="17" geoCode="17" geoId="JP-17" geoName="ç³å·ç" geoTypeId="PROVINCE" wellKnownText="Ishikawa"/> - <Geo abbreviation="18" geoCode="18" geoId="JP-18" geoName="ç¦äºç" geoTypeId="PROVINCE" wellKnownText="Fukui"/> - <Geo abbreviation="19" geoCode="19" geoId="JP-19" geoName="山梨ç" geoTypeId="PROVINCE" wellKnownText="Yamanashi"/> - <Geo abbreviation="20" geoCode="20" geoId="JP-20" geoName="é·éç" geoTypeId="PROVINCE" wellKnownText="Nagano"/> - <Geo abbreviation="21" geoCode="21" geoId="JP-21" geoName="å²éç" geoTypeId="PROVINCE" wellKnownText="Gifu"/> - <Geo abbreviation="22" geoCode="22" geoId="JP-22" geoName="é岡ç" geoTypeId="PROVINCE" wellKnownText="Shizuoka"/> - <Geo abbreviation="23" geoCode="23" geoId="JP-23" geoName="æç¥ç" geoTypeId="PROVINCE" wellKnownText="Aichi"/> - <Geo abbreviation="24" geoCode="24" geoId="JP-24" geoName="ä¸éç" geoTypeId="PROVINCE" wellKnownText="Mie"/> - <Geo abbreviation="25" geoCode="25" geoId="JP-25" geoName="æ»è³ç" geoTypeId="PROVINCE" wellKnownText="Shiga"/> - <Geo abbreviation="26" geoCode="26" geoId="JP-26" geoName="京é½åº" geoTypeId="PROVINCE" wellKnownText="Kyoto"/> - <Geo abbreviation="27" geoCode="27" geoId="JP-27" geoName="大éªåº" geoTypeId="PROVINCE" wellKnownText="Osaka"/> - <Geo abbreviation="28" geoCode="28" geoId="JP-28" geoName="å µåº«ç" geoTypeId="PROVINCE" wellKnownText="Hyogo"/> - <Geo abbreviation="29" geoCode="29" geoId="JP-29" geoName="å¥è¯ç" geoTypeId="PROVINCE" wellKnownText="Nara"/> - <Geo abbreviation="30" geoCode="30" geoId="JP-30" geoName="åæå±±ç" geoTypeId="PROVINCE" wellKnownText="Wakayama"/> - <Geo abbreviation="31" geoCode="31" geoId="JP-31" geoName="é³¥åç" geoTypeId="PROVINCE" wellKnownText="Tottori"/> - <Geo abbreviation="32" geoCode="32" geoId="JP-32" geoName="å³¶æ ¹ç" geoTypeId="PROVINCE" wellKnownText="Shimane"/> - <Geo abbreviation="33" geoCode="33" geoId="JP-33" geoName="岡山ç" geoTypeId="PROVINCE" wellKnownText="Okayama"/> - <Geo abbreviation="34" geoCode="34" geoId="JP-34" geoName="åºå³¶ç" geoTypeId="PROVINCE" wellKnownText="Hiroshima"/> - <Geo abbreviation="35" geoCode="35" geoId="JP-35" geoName="å±±å£ç" geoTypeId="PROVINCE" wellKnownText="Yamaguchi"/> - <Geo abbreviation="36" geoCode="36" geoId="JP-36" geoName="徳島ç" geoTypeId="PROVINCE" wellKnownText="Tokushima"/> - <Geo abbreviation="37" geoCode="37" geoId="JP-37" geoName="é¦å·ç" geoTypeId="PROVINCE" wellKnownText="Kagawa"/> - <Geo abbreviation="38" geoCode="38" geoId="JP-38" geoName="æåªç" geoTypeId="PROVINCE" wellKnownText="Ehime"/> - <Geo abbreviation="39" geoCode="39" geoId="JP-39" geoName="é«ç¥ç" geoTypeId="PROVINCE" wellKnownText="Kochi"/> - <Geo abbreviation="40" geoCode="40" geoId="JP-40" geoName="ç¦å²¡ç" geoTypeId="PROVINCE" wellKnownText="Fukuoka"/> - <Geo abbreviation="41" geoCode="41" geoId="JP-41" geoName="ä½è³ç" geoTypeId="PROVINCE" wellKnownText="Saga"/> - <Geo abbreviation="42" geoCode="42" geoId="JP-42" geoName="é·å´ç" geoTypeId="PROVINCE" wellKnownText="Nagasaki"/> - <Geo abbreviation="43" geoCode="43" geoId="JP-43" geoName="çæ¬ç" geoTypeId="PROVINCE" wellKnownText="Kumamoto"/> - <Geo abbreviation="44" geoCode="44" geoId="JP-44" geoName="大åç" geoTypeId="PROVINCE" wellKnownText="Oita"/> - <Geo abbreviation="45" geoCode="45" geoId="JP-45" geoName="å®®å´ç" geoTypeId="PROVINCE" wellKnownText="Miyazaki"/> - <Geo abbreviation="46" geoCode="46" geoId="JP-46" geoName="鹿å 島ç" geoTypeId="PROVINCE" wellKnownText="Kagoshima"/> - <Geo abbreviation="47" geoCode="47" geoId="JP-47" geoName="æ²ç¸ç" geoTypeId="PROVINCE" wellKnownText="Okinawa"/> + <Geo abbreviation="HK" geoCode="01" geoId="JP-01" geoName="åæµ·é" geoTypeId="PROVINCE" wellKnownText="Hokkaido"/> + <Geo abbreviation="AO" geoCode="02" geoId="JP-02" geoName="é森ç" geoTypeId="PROVINCE" wellKnownText="Aomori"/> + <Geo abbreviation="IT" geoCode="03" geoId="JP-03" geoName="岩æç" geoTypeId="PROVINCE" wellKnownText="Iwate"/> + <Geo abbreviation="MG" geoCode="04" geoId="JP-04" geoName="å®®åç" geoTypeId="PROVINCE" wellKnownText="Miyagi"/> + <Geo abbreviation="AK" geoCode="05" geoId="JP-05" geoName="ç§ç°ç" geoTypeId="PROVINCE" wellKnownText="Akita"/> + <Geo abbreviation="YG" geoCode="06" geoId="JP-06" geoName="山形ç" geoTypeId="PROVINCE" wellKnownText="Yamagata"/> + <Geo abbreviation="FS" geoCode="07" geoId="JP-07" geoName="ç¦å³¶ç" geoTypeId="PROVINCE" wellKnownText="Fukushima"/> + <Geo abbreviation="IB" geoCode="08" geoId="JP-08" geoName="è¨åç" geoTypeId="PROVINCE" wellKnownText="Ibaraki"/> + <Geo abbreviation="TC" geoCode="09" geoId="JP-09" geoName="æ æ¨ç" geoTypeId="PROVINCE" wellKnownText="Tochigi"/> + <Geo abbreviation="GU" geoCode="10" geoId="JP-10" geoName="群馬ç" geoTypeId="PROVINCE" wellKnownText="Gunma"/> + <Geo abbreviation="ST" geoCode="11" geoId="JP-11" geoName="å¼çç" geoTypeId="PROVINCE" wellKnownText="Saitama"/> + <Geo abbreviation="CB" geoCode="12" geoId="JP-12" geoName="åèç" geoTypeId="PROVINCE" wellKnownText="Chiba"/> + <Geo abbreviation="TY" geoCode="13" geoId="JP-13" geoName="æ±äº¬é½" geoTypeId="PROVINCE" wellKnownText="Tokyo"/> + <Geo abbreviation="KN" geoCode="14" geoId="JP-14" geoName="ç¥å¥å·ç" geoTypeId="PROVINCE" wellKnownText="Kanagawa"/> + <Geo abbreviation="NI" geoCode="15" geoId="JP-15" geoName="æ°æ½ç" geoTypeId="PROVINCE" wellKnownText="Niigata"/> + <Geo abbreviation="TM" geoCode="16" geoId="JP-16" geoName="å¯å±±ç" geoTypeId="PROVINCE" wellKnownText="Toyama"/> + <Geo abbreviation="IS" geoCode="17" geoId="JP-17" geoName="ç³å·ç" geoTypeId="PROVINCE" wellKnownText="Ishikawa"/> + <Geo abbreviation="FI" geoCode="18" geoId="JP-18" geoName="ç¦äºç" geoTypeId="PROVINCE" wellKnownText="Fukui"/> + <Geo abbreviation="YN" geoCode="19" geoId="JP-19" geoName="山梨ç" geoTypeId="PROVINCE" wellKnownText="Yamanashi"/> + <Geo abbreviation="NA" geoCode="20" geoId="JP-20" geoName="é·éç" geoTypeId="PROVINCE" wellKnownText="Nagano"/> + <Geo abbreviation="GI" geoCode="21" geoId="JP-21" geoName="å²éç" geoTypeId="PROVINCE" wellKnownText="Gifu"/> + <Geo abbreviation="SZ" geoCode="22" geoId="JP-22" geoName="é岡ç" geoTypeId="PROVINCE" wellKnownText="Shizuoka"/> + <Geo abbreviation="AI" geoCode="23" geoId="JP-23" geoName="æç¥ç" geoTypeId="PROVINCE" wellKnownText="Aichi"/> + <Geo abbreviation="ME" geoCode="24" geoId="JP-24" geoName="ä¸éç" geoTypeId="PROVINCE" wellKnownText="Mie"/> + <Geo abbreviation="SI" geoCode="25" geoId="JP-25" geoName="æ»è³ç" geoTypeId="PROVINCE" wellKnownText="Shiga"/> + <Geo abbreviation="KY" geoCode="26" geoId="JP-26" geoName="京é½åº" geoTypeId="PROVINCE" wellKnownText="Kyoto"/> + <Geo abbreviation="OS" geoCode="27" geoId="JP-27" geoName="大éªåº" geoTypeId="PROVINCE" wellKnownText="Osaka"/> + <Geo abbreviation="HG" geoCode="28" geoId="JP-28" geoName="å µåº«ç" geoTypeId="PROVINCE" wellKnownText="Hyogo"/> + <Geo abbreviation="NR" geoCode="29" geoId="JP-29" geoName="å¥è¯ç" geoTypeId="PROVINCE" wellKnownText="Nara"/> + <Geo abbreviation="WA" geoCode="30" geoId="JP-30" geoName="åæå±±ç" geoTypeId="PROVINCE" wellKnownText="Wakayama"/> + <Geo abbreviation="TT" geoCode="31" geoId="JP-31" geoName="é³¥åç" geoTypeId="PROVINCE" wellKnownText="Tottori"/> + <Geo abbreviation="SM" geoCode="32" geoId="JP-32" geoName="å³¶æ ¹ç" geoTypeId="PROVINCE" wellKnownText="Shimane"/> + <Geo abbreviation="OY" geoCode="33" geoId="JP-33" geoName="岡山ç" geoTypeId="PROVINCE" wellKnownText="Okayama"/> + <Geo abbreviation="HS" geoCode="34" geoId="JP-34" geoName="åºå³¶ç" geoTypeId="PROVINCE" wellKnownText="Hiroshima"/> + <Geo abbreviation="YA" geoCode="35" geoId="JP-35" geoName="å±±å£ç" geoTypeId="PROVINCE" wellKnownText="Yamaguchi"/> + <Geo abbreviation="TK" geoCode="36" geoId="JP-36" geoName="徳島ç" geoTypeId="PROVINCE" wellKnownText="Tokushima"/> + <Geo abbreviation="KA" geoCode="37" geoId="JP-37" geoName="é¦å·ç" geoTypeId="PROVINCE" wellKnownText="Kagawa"/> + <Geo abbreviation="EH" geoCode="38" geoId="JP-38" geoName="æåªç" geoTypeId="PROVINCE" wellKnownText="Ehime"/> + <Geo abbreviation="KO" geoCode="39" geoId="JP-39" geoName="é«ç¥ç" geoTypeId="PROVINCE" wellKnownText="Kochi"/> + <Geo abbreviation="FO" geoCode="40" geoId="JP-40" geoName="ç¦å²¡ç" geoTypeId="PROVINCE" wellKnownText="Fukuoka"/> + <Geo abbreviation="SG" geoCode="41" geoId="JP-41" geoName="ä½è³ç" geoTypeId="PROVINCE" wellKnownText="Saga"/> + <Geo abbreviation="NS" geoCode="42" geoId="JP-42" geoName="é·å´ç" geoTypeId="PROVINCE" wellKnownText="Nagasaki"/> + <Geo abbreviation="KU" geoCode="43" geoId="JP-43" geoName="çæ¬ç" geoTypeId="PROVINCE" wellKnownText="Kumamoto"/> + <Geo abbreviation="OI" geoCode="44" geoId="JP-44" geoName="大åç" geoTypeId="PROVINCE" wellKnownText="Oita"/> + <Geo abbreviation="MZ" geoCode="45" geoId="JP-45" geoName="å®®å´ç" geoTypeId="PROVINCE" wellKnownText="Miyazaki"/> + <Geo abbreviation="KG" geoCode="46" geoId="JP-46" geoName="鹿å 島ç" geoTypeId="PROVINCE" wellKnownText="Kagoshima"/> + <Geo abbreviation="OK" geoCode="47" geoId="JP-47" geoName="æ²ç¸ç" geoTypeId="PROVINCE" wellKnownText="Okinawa"/> <GeoAssoc geoId="JPN" geoIdTo="JP-01" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="JPN" geoIdTo="JP-02" geoAssocTypeId="REGIONS"/> Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy?rev=1761194&r1=1761193&r2=1761194&view=diff ============================================================================== --- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy (original) +++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy Sat Sep 17 11:04:14 2016 @@ -86,4 +86,18 @@ if (userLogin) { partyAndContactMechList = from("PartyAndContactMech").where("partyId", partyId).orderBy("-fromDate").filterByDate().queryList(); context.partyAndContactMechList = partyAndContactMechList; + + // state/province & country's name + if (partyContactMechValueMaps) { + partyContactMechValueMaps.each { + if (it.postalAddress) { + postalAddress = it.postalAddress; + countryGeo = postalAddress.getRelatedOne("CountryGeo", false); + if (countryGeo) it.countryGeoName = countryGeo.getString("geoName"); + stateProvinceGeo = postalAddress.getRelatedOne("StateProvinceGeo", false); + if (stateProvinceGeo) it.stateProvinceGeoName = stateProvinceGeo.getString("geoName"); + + } + } + } } Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=1761194&r1=1761193&r2=1761194&view=diff ============================================================================== --- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original) +++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sat Sep 17 11:04:14 2016 @@ -154,8 +154,8 @@ under the License. <#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if> ${postalAddress.address1}<br /> <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> - ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!} - <#if postalAddress.countryGeoId?has_content><br />${postalAddress.countryGeoId}</#if> + ${postalAddress.city}<#if partyContactMechValueMap.stateProvinceGeoName?has_content>, ${partyContactMechValueMap.stateProvinceGeoName}</#if> ${postalAddress.postalCode!} + <#if partyContactMechValueMap.countryGeoName?has_content><br />${partyContactMechValueMap.countryGeoName}</#if> <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId! = "USA")> <#assign addr1 = postalAddress.address1! /> <#if (addr1.indexOf(" ") > 0)> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |