You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2015/06/20 12:27:50 UTC
svn commit: r1686547 - in /ofbiz/branches/release14.12: ./
applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
framework/common/config/general.properties
framework/entity/config/entityengine.xml
Author: arunpatidar
Date: Sat Jun 20 10:27:50 2015
New Revision: 1686547
URL: http://svn.apache.org/r1686547
Log:
Applied fix from trunk for revision: 1686545
===
[OFBIZ-6347] Applied patch from task. Removed code to create duplicate OPP record. Thanks Mohammad Kathawala for the patch.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/branches/release14.12/framework/common/config/general.properties
ofbiz/branches/release14.12/framework/entity/config/entityengine.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 20 10:27:50 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/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
+/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
Modified: ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1686547&r1=1686546&r2=1686547&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/release14.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Sat Jun 20 10:27:50 2015
@@ -3855,18 +3855,6 @@ public class ShoppingCart implements Ite
if (billingAccountAvailableAmount.compareTo(getBillingAccountAmount()) < 0) {
this.billingAccountAmt = billingAccountAvailableAmount;
}
- BigDecimal billingAccountAmountSelected = getBillingAccountAmount();
- GenericValue opp = delegator.makeValue("OrderPaymentPreference", new HashMap<String, Object>());
- opp.set("paymentMethodTypeId", "EXT_BILLACT");
- opp.set("presentFlag", "N");
- opp.set("overflowFlag", "N");
- opp.set("maxAmount", billingAccountAmountSelected);
- opp.set("statusId", "PAYMENT_NOT_RECEIVED");
- allOpPrefs.add(opp);
- remainingAmount = remainingAmount.subtract(billingAccountAmountSelected);
- if (remainingAmount.compareTo(BigDecimal.ZERO) < 0) {
- remainingAmount = BigDecimal.ZERO;
- }
}
for (CartPaymentInfo inf : paymentInfo) {
if (inf.amount == null) {
Modified: ofbiz/branches/release14.12/framework/common/config/general.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/config/general.properties?rev=1686547&r1=1686546&r2=1686547&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/common/config/general.properties (original)
+++ ofbiz/branches/release14.12/framework/common/config/general.properties Sat Jun 20 10:27:50 2015
@@ -129,4 +129,4 @@ mail.spam.name=X-Spam-Flag
mail.spam.value=YES
# -- Y if you want to display the multi-tenant textbox in the login page and install specify components which related to each tenant
-multitenant=N
+multitenant=Y
Modified: ofbiz/branches/release14.12/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/entity/config/entityengine.xml?rev=1686547&r1=1686546&r2=1686547&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/entity/config/entityengine.xml (original)
+++ ofbiz/branches/release14.12/framework/entity/config/entityengine.xml Sat Jun 20 10:27:50 2015
@@ -52,21 +52,21 @@ access. For a detailed description see t
<debug-xa-resources value="false" /> <!-- see https://issues.apache.org/jira/browse/OFBIZ-4282 for more -->
<delegator name="default" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main" distributed-cache-clear-enabled="false">
- <group-map group-name="org.ofbiz" datasource-name="localderby"/>
- <group-map group-name="org.ofbiz.olap" datasource-name="localderbyolap"/>
- <group-map group-name="org.ofbiz.tenant" datasource-name="localderbytenant"/>
+ <group-map group-name="org.ofbiz" datasource-name="localpostgres"/>
+ <group-map group-name="org.ofbiz.olap" datasource-name="localpostolap"/>
+ <group-map group-name="org.ofbiz.tenant" datasource-name="localposttenant"/>
</delegator>
<delegator name="default-no-eca" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main" entity-eca-enabled="false" distributed-cache-clear-enabled="false">
- <group-map group-name="org.ofbiz" datasource-name="localderby"/>
- <group-map group-name="org.ofbiz.olap" datasource-name="localderbyolap"/>
- <group-map group-name="org.ofbiz.tenant" datasource-name="localderbytenant"/>
+ <group-map group-name="org.ofbiz" datasource-name="localpostgres"/>
+ <group-map group-name="org.ofbiz.olap" datasource-name="localpostolap"/>
+ <group-map group-name="org.ofbiz.tenant" datasource-name="localposttenant"/>
</delegator>
<!-- be sure that your default delegator (or the one you use) uses the same datasource for test. You must run "ant load-demo" before running "ant run-tests" -->
<delegator name="test" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main">
- <group-map group-name="org.ofbiz" datasource-name="localderby"/>
- <group-map group-name="org.ofbiz.olap" datasource-name="localderbyolap"/>
- <group-map group-name="org.ofbiz.tenant" datasource-name="localderbytenant"/>
+ <group-map group-name="org.ofbiz" datasource-name="localpostgres"/>
+ <group-map group-name="org.ofbiz.olap" datasource-name="localpostolap"/>
+ <group-map group-name="org.ofbiz.tenant" datasource-name="localposttenant"/>
</delegator>
<!-- need to at least define a name for each component to use -->
@@ -470,8 +470,8 @@ access. For a detailed description see t
<inline-jdbc
jdbc-driver="org.postgresql.Driver"
jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz"
- jdbc-username="ofbiz"
- jdbc-password="ofbiz"
+ jdbc-username="arun"
+ jdbc-password="123456"
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
@@ -508,8 +508,8 @@ access. For a detailed description see t
<inline-jdbc
jdbc-driver="org.postgresql.Driver"
jdbc-uri="jdbc:postgresql://127.0.0.1/ofbizolap"
- jdbc-username="ofbiz"
- jdbc-password="ofbiz"
+ jdbc-username="arun"
+ jdbc-password="123456"
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
@@ -545,8 +545,8 @@ access. For a detailed description see t
<inline-jdbc
jdbc-driver="org.postgresql.Driver"
jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiztenant"
- jdbc-username="ofbiz"
- jdbc-password="ofbiz"
+ jdbc-username="arun"
+ jdbc-password="123456"
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"