Skip to content

P
PERFORMA_REPLICA
Commit 72e359bf by Nilu
Options

multiple plans in one subscription and create seperate charge when upgradig a… 

multiple plans in one subscription and create seperate charge when upgradig a plan - as proration should be disabled and when disabled only at the next billing cycle the payment will be charged.
parent 2f2126fd
Showing with 772 additions and 69 deletions
cmsWebApp/sql/HiringTeam.xml
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
<column name="manage_own_billing" type="Boolean" nullable="true"/> <column name="manage_own_billing" type="Boolean" nullable="true"/>
<column name="stripe_reference" type="String" nullable="true" length="100"/> <column name="stripe_reference" type="String" nullable="true" length="100"/>
<column name="stripe_subscription" type="String" nullable="true" length="100"/> <column name="stripe_subscription" type="String" nullable="true" length="100"/>
<column name="stripe_fixed_sub_item" type="String" nullable="true" length="100"/>
<column name="stripe_metered_sub_item" type="String" nullable="true" length="100"/>
<column name="name_on_card" type="String" nullable="true" length="100"/> <column name="name_on_card" type="String" nullable="true" length="100"/>
<column name="card_post_code" type="String" nullable="true" length="10"/> <column name="card_post_code" type="String" nullable="true" length="10"/>
<column name="card_id" type="String" nullable="true" length="100"/> <column name="card_id" type="String" nullable="true" length="100"/>
<column name="plan_renewed_on" type="Date" nullable="true"/> <column name="plan_renewed_on" type="Date" nullable="true"/>
<column name="used_credits" type="Long" nullable="true"/> <column name="used_credits" type="Long" nullable="true"/>
<column name="available_credits" type="Long" nullable="true"/>
<column name="is_ppj" type="Boolean" nullable="true"/> <column name="is_ppj" type="Boolean" nullable="true"/>
<column name="has_cap" type="Boolean" nullable="true"/> <column name="has_cap" type="Boolean" nullable="true"/>
<column name="max_cap" type="Long" nullable="true"/> <column name="max_cap" type="Long" nullable="true"/>
......
cmsWebApp/sql/ms/HiringTeam.sql
...@@ -21,11 +21,14 @@ CREATE TABLE tl_hiring_team ( ...@@ -21,11 +21,14 @@ CREATE TABLE tl_hiring_team (
manage_own_billing char(1) NULL, manage_own_billing char(1) NULL,
stripe_reference varchar(100) NULL, stripe_reference varchar(100) NULL,
stripe_subscription varchar(100) NULL, stripe_subscription varchar(100) NULL,
stripe_fixed_sub_item varchar(100) NULL,
stripe_metered_sub_item varchar(100) NULL,
name_on_card varchar(100) NULL, name_on_card varchar(100) NULL,
card_post_code varchar(10) NULL, card_post_code varchar(10) NULL,
card_id varchar(100) NULL, card_id varchar(100) NULL,
plan_renewed_on datetime NULL, plan_renewed_on datetime NULL,
used_credits numeric(12) NULL, used_credits numeric(12) NULL,
available_credits numeric(12) NULL,
is_ppj char(1) NULL, is_ppj char(1) NULL,
has_cap char(1) NULL, has_cap char(1) NULL,
max_cap numeric(12) NULL, max_cap numeric(12) NULL,
......
cmsWebApp/sql/oracle/HiringTeam.sql
...@@ -22,11 +22,14 @@ CREATE TABLE tl_hiring_team ( ...@@ -22,11 +22,14 @@ CREATE TABLE tl_hiring_team (
manage_own_billing char(1) NULL, manage_own_billing char(1) NULL,
stripe_reference varchar2(100) NULL, stripe_reference varchar2(100) NULL,
stripe_subscription varchar2(100) NULL, stripe_subscription varchar2(100) NULL,
stripe_fixed_sub_item varchar2(100) NULL,
stripe_metered_sub_item varchar2(100) NULL,
name_on_card varchar2(100) NULL, name_on_card varchar2(100) NULL,
card_post_code varchar2(10) NULL, card_post_code varchar2(10) NULL,
card_id varchar2(100) NULL, card_id varchar2(100) NULL,
plan_renewed_on date NULL, plan_renewed_on date NULL,
used_credits number(12) NULL, used_credits number(12) NULL,
available_credits number(12) NULL,
is_ppj char(1) NULL, is_ppj char(1) NULL,
has_cap char(1) NULL, has_cap char(1) NULL,
max_cap number(12) NULL, max_cap number(12) NULL,
......
cmsWebApp/sql/postgres/HiringTeam.sql
...@@ -22,11 +22,14 @@ CREATE TABLE tl_hiring_team ( ...@@ -22,11 +22,14 @@ CREATE TABLE tl_hiring_team (
manage_own_billing char(1) NULL, manage_own_billing char(1) NULL,
stripe_reference varchar(100) NULL, stripe_reference varchar(100) NULL,
stripe_subscription varchar(100) NULL, stripe_subscription varchar(100) NULL,
stripe_fixed_sub_item varchar(100) NULL,
stripe_metered_sub_item varchar(100) NULL,
name_on_card varchar(100) NULL, name_on_card varchar(100) NULL,
card_post_code varchar(10) NULL, card_post_code varchar(10) NULL,
card_id varchar(100) NULL, card_id varchar(100) NULL,
plan_renewed_on timestamp NULL, plan_renewed_on timestamp NULL,
used_credits numeric(12) NULL, used_credits numeric(12) NULL,
available_credits numeric(12) NULL,
is_ppj char(1) NULL, is_ppj char(1) NULL,
has_cap char(1) NULL, has_cap char(1) NULL,
max_cap numeric(12) NULL, max_cap numeric(12) NULL,
......
cmsWebApp/src/performa/form/MakePaymentFP.java
...@@ -81,7 +81,7 @@ public class MakePaymentFP extends SaveFP ...@@ -81,7 +81,7 @@ public class MakePaymentFP extends SaveFP
{ {
LogMgr.log(LOG, LogLevel.PROCESSING1, e, "Error while making a payment of company stripe " + company.getStripeReference()); LogMgr.log(LOG, LogLevel.PROCESSING1, e, "Error while making a payment of company stripe " + company.getStripeReference());
throw new BusinessException("Stripe payment was failed, Please contact adminstrator for more info."); throw new BusinessException("Stripe payment failed, Please contact adminstrator for more info.");
} }
} }
......
cmsWebApp/src/performa/form/SaveCompanyFP.java
package performa.form; package performa.form;
import com.stripe.model.Subscription; import com.stripe.model.Subscription;
import java.util.Date;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import oneit.logging.LogLevel; import oneit.logging.LogLevel;
...@@ -59,11 +60,36 @@ public class SaveCompanyFP extends SaveFP ...@@ -59,11 +60,36 @@ public class SaveCompanyFP extends SaveFP
} }
// cannot subscribe a user to a plan without card details // cannot subscribe a user to a plan without card details
Subscription updatedSubscription = StripeUtils.updatePlan(hiringTeam); Subscription subscription = StripeUtils.retrieveSubscription(hiringTeam.getStripeSubscription());
Subscription updatedSubscription = StripeUtils.updatePlan(hiringTeam, subscription, paymentPlan);
if(updatedSubscription == null) if(updatedSubscription == null)
{ {
throw new BusinessException("Problem with changing your plan. Please contact admin."); throw new BusinessException("Problem with changing your plan. Please contact adminstrator for more info.");
}
PaymentPlan currentPlan = hiringTeam.getPaymentPlan();
if(currentPlan != null && currentPlan.getActiveJobCount() < paymentPlan.getActiveJobCount())
{
double discountPercentage = 0d;
if(subscription.getDiscount() != null && subscription.getDiscount().getCoupon() != null && subscription.getDiscount().getCoupon().getPercentOff() != null)
{
discountPercentage = subscription.getDiscount().getCoupon().getPercentOff().doubleValue();
}
boolean hasValidCoupon = hiringTeam.hasValidCouponOn(new Date(subscription.getCurrentPeriodEnd() * 1000));
double currentPlanCost = discountPercentage > 0 ? currentPlan.getAmount() * discountPercentage * 0.01 : currentPlan.getAmount();
double newPlanCost = hasValidCoupon ? paymentPlan.getAmount() * hiringTeam.getCoupon().getPercentageOff() * 0.01 : paymentPlan.getAmount();
double costDiff = newPlanCost - currentPlanCost;
StripeUtils.chargeUpgradePlanDifference(hiringTeam, costDiff);
}
if(currentPlan == null || currentPlan.getActiveJobCount() < paymentPlan.getActiveJobCount())
{
hiringTeam.setAvailableCredits(paymentPlan.getActiveJobCount());
} }
hiringTeam.setPaymentPlan(paymentPlan); hiringTeam.setPaymentPlan(paymentPlan);
......
cmsWebApp/src/performa/orm/BaseHiringTeam.java
...@@ -57,11 +57,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -57,11 +57,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
public static final String FIELD_ManageOwnBilling = "ManageOwnBilling"; public static final String FIELD_ManageOwnBilling = "ManageOwnBilling";
public static final String FIELD_StripeReference = "StripeReference"; public static final String FIELD_StripeReference = "StripeReference";
public static final String FIELD_StripeSubscription = "StripeSubscription"; public static final String FIELD_StripeSubscription = "StripeSubscription";
public static final String FIELD_StripeFixedSubItem = "StripeFixedSubItem";
public static final String FIELD_StripeMeteredSubItem = "StripeMeteredSubItem";
public static final String FIELD_NameOnCard = "NameOnCard"; public static final String FIELD_NameOnCard = "NameOnCard";
public static final String FIELD_CardPostCode = "CardPostCode"; public static final String FIELD_CardPostCode = "CardPostCode";
public static final String FIELD_CardID = "CardID"; public static final String FIELD_CardID = "CardID";
public static final String FIELD_PlanRenewedOn = "PlanRenewedOn"; public static final String FIELD_PlanRenewedOn = "PlanRenewedOn";
public static final String FIELD_UsedCredits = "UsedCredits"; public static final String FIELD_UsedCredits = "UsedCredits";
public static final String FIELD_AvailableCredits = "AvailableCredits";
public static final String FIELD_IsPPJ = "IsPPJ"; public static final String FIELD_IsPPJ = "IsPPJ";
public static final String FIELD_HasCap = "HasCap"; public static final String FIELD_HasCap = "HasCap";
public static final String FIELD_MaxCap = "MaxCap"; public static final String FIELD_MaxCap = "MaxCap";
...@@ -99,11 +102,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -99,11 +102,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
private static final DefaultAttributeHelper<HiringTeam> HELPER_ManageOwnBilling = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_ManageOwnBilling = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_StripeReference = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_StripeReference = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_StripeSubscription = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_StripeSubscription = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_StripeFixedSubItem = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_StripeMeteredSubItem = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_NameOnCard = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_NameOnCard = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_CardPostCode = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_CardPostCode = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_CardID = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_CardID = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_PlanRenewedOn = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_PlanRenewedOn = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_UsedCredits = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_UsedCredits = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_AvailableCredits = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_HasCap = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_HasCap = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_MaxCap = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_MaxCap = DefaultAttributeHelper.INSTANCE;
...@@ -128,11 +134,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -128,11 +134,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
private Boolean _ManageOwnBilling; private Boolean _ManageOwnBilling;
private String _StripeReference; private String _StripeReference;
private String _StripeSubscription; private String _StripeSubscription;
private String _StripeFixedSubItem;
private String _StripeMeteredSubItem;
private String _NameOnCard; private String _NameOnCard;
private String _CardPostCode; private String _CardPostCode;
private String _CardID; private String _CardID;
private Date _PlanRenewedOn; private Date _PlanRenewedOn;
private Integer _UsedCredits; private Integer _UsedCredits;
private Integer _AvailableCredits;
private Boolean _IsPPJ; private Boolean _IsPPJ;
private Boolean _HasCap; private Boolean _HasCap;
private Integer _MaxCap; private Integer _MaxCap;
...@@ -177,11 +186,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -177,11 +186,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
private static final AttributeValidator[] FIELD_ManageOwnBilling_Validators; private static final AttributeValidator[] FIELD_ManageOwnBilling_Validators;
private static final AttributeValidator[] FIELD_StripeReference_Validators; private static final AttributeValidator[] FIELD_StripeReference_Validators;
private static final AttributeValidator[] FIELD_StripeSubscription_Validators; private static final AttributeValidator[] FIELD_StripeSubscription_Validators;
private static final AttributeValidator[] FIELD_StripeFixedSubItem_Validators;
private static final AttributeValidator[] FIELD_StripeMeteredSubItem_Validators;
private static final AttributeValidator[] FIELD_NameOnCard_Validators; private static final AttributeValidator[] FIELD_NameOnCard_Validators;
private static final AttributeValidator[] FIELD_CardPostCode_Validators; private static final AttributeValidator[] FIELD_CardPostCode_Validators;
private static final AttributeValidator[] FIELD_CardID_Validators; private static final AttributeValidator[] FIELD_CardID_Validators;
private static final AttributeValidator[] FIELD_PlanRenewedOn_Validators; private static final AttributeValidator[] FIELD_PlanRenewedOn_Validators;
private static final AttributeValidator[] FIELD_UsedCredits_Validators; private static final AttributeValidator[] FIELD_UsedCredits_Validators;
private static final AttributeValidator[] FIELD_AvailableCredits_Validators;
private static final AttributeValidator[] FIELD_IsPPJ_Validators; private static final AttributeValidator[] FIELD_IsPPJ_Validators;
private static final AttributeValidator[] FIELD_HasCap_Validators; private static final AttributeValidator[] FIELD_HasCap_Validators;
private static final AttributeValidator[] FIELD_MaxCap_Validators; private static final AttributeValidator[] FIELD_MaxCap_Validators;
...@@ -226,11 +238,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -226,11 +238,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
FIELD_ManageOwnBilling_Validators = (AttributeValidator[])setupAttribMetaData_ManageOwnBilling(validatorMapping).toArray (new AttributeValidator[0]); FIELD_ManageOwnBilling_Validators = (AttributeValidator[])setupAttribMetaData_ManageOwnBilling(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_StripeReference_Validators = (AttributeValidator[])setupAttribMetaData_StripeReference(validatorMapping).toArray (new AttributeValidator[0]); FIELD_StripeReference_Validators = (AttributeValidator[])setupAttribMetaData_StripeReference(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_StripeSubscription_Validators = (AttributeValidator[])setupAttribMetaData_StripeSubscription(validatorMapping).toArray (new AttributeValidator[0]); FIELD_StripeSubscription_Validators = (AttributeValidator[])setupAttribMetaData_StripeSubscription(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_StripeFixedSubItem_Validators = (AttributeValidator[])setupAttribMetaData_StripeFixedSubItem(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_StripeMeteredSubItem_Validators = (AttributeValidator[])setupAttribMetaData_StripeMeteredSubItem(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_NameOnCard_Validators = (AttributeValidator[])setupAttribMetaData_NameOnCard(validatorMapping).toArray (new AttributeValidator[0]); FIELD_NameOnCard_Validators = (AttributeValidator[])setupAttribMetaData_NameOnCard(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CardPostCode_Validators = (AttributeValidator[])setupAttribMetaData_CardPostCode(validatorMapping).toArray (new AttributeValidator[0]); FIELD_CardPostCode_Validators = (AttributeValidator[])setupAttribMetaData_CardPostCode(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CardID_Validators = (AttributeValidator[])setupAttribMetaData_CardID(validatorMapping).toArray (new AttributeValidator[0]); FIELD_CardID_Validators = (AttributeValidator[])setupAttribMetaData_CardID(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_PlanRenewedOn_Validators = (AttributeValidator[])setupAttribMetaData_PlanRenewedOn(validatorMapping).toArray (new AttributeValidator[0]); FIELD_PlanRenewedOn_Validators = (AttributeValidator[])setupAttribMetaData_PlanRenewedOn(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_UsedCredits_Validators = (AttributeValidator[])setupAttribMetaData_UsedCredits(validatorMapping).toArray (new AttributeValidator[0]); FIELD_UsedCredits_Validators = (AttributeValidator[])setupAttribMetaData_UsedCredits(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_AvailableCredits_Validators = (AttributeValidator[])setupAttribMetaData_AvailableCredits(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_IsPPJ_Validators = (AttributeValidator[])setupAttribMetaData_IsPPJ(validatorMapping).toArray (new AttributeValidator[0]); FIELD_IsPPJ_Validators = (AttributeValidator[])setupAttribMetaData_IsPPJ(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_HasCap_Validators = (AttributeValidator[])setupAttribMetaData_HasCap(validatorMapping).toArray (new AttributeValidator[0]); FIELD_HasCap_Validators = (AttributeValidator[])setupAttribMetaData_HasCap(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_MaxCap_Validators = (AttributeValidator[])setupAttribMetaData_MaxCap(validatorMapping).toArray (new AttributeValidator[0]); FIELD_MaxCap_Validators = (AttributeValidator[])setupAttribMetaData_MaxCap(validatorMapping).toArray (new AttributeValidator[0]);
...@@ -686,6 +701,44 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -686,6 +701,44 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_StripeFixedSubItem(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "stripe_fixed_sub_item");
metaInfo.put ("length", "100");
metaInfo.put ("name", "StripeFixedSubItem");
metaInfo.put ("type", "String");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for HiringTeam.StripeFixedSubItem:", metaInfo);
ATTRIBUTES_METADATA_HiringTeam.put (FIELD_StripeFixedSubItem, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(HiringTeam.class, "StripeFixedSubItem", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for HiringTeam.StripeFixedSubItem:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_StripeMeteredSubItem(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "stripe_metered_sub_item");
metaInfo.put ("length", "100");
metaInfo.put ("name", "StripeMeteredSubItem");
metaInfo.put ("type", "String");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for HiringTeam.StripeMeteredSubItem:", metaInfo);
ATTRIBUTES_METADATA_HiringTeam.put (FIELD_StripeMeteredSubItem, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(HiringTeam.class, "StripeMeteredSubItem", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for HiringTeam.StripeMeteredSubItem:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_NameOnCard(Map validatorMapping) private static List setupAttribMetaData_NameOnCard(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
...@@ -780,6 +833,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -780,6 +833,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_AvailableCredits(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "available_credits");
metaInfo.put ("name", "AvailableCredits");
metaInfo.put ("type", "Integer");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for HiringTeam.AvailableCredits:", metaInfo);
ATTRIBUTES_METADATA_HiringTeam.put (FIELD_AvailableCredits, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(HiringTeam.class, "AvailableCredits", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for HiringTeam.AvailableCredits:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_IsPPJ(Map validatorMapping) private static List setupAttribMetaData_IsPPJ(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
...@@ -893,11 +964,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -893,11 +964,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
_ManageOwnBilling = (Boolean)(Boolean.TRUE); _ManageOwnBilling = (Boolean)(Boolean.TRUE);
_StripeReference = (String)(HELPER_StripeReference.initialise (_StripeReference)); _StripeReference = (String)(HELPER_StripeReference.initialise (_StripeReference));
_StripeSubscription = (String)(HELPER_StripeSubscription.initialise (_StripeSubscription)); _StripeSubscription = (String)(HELPER_StripeSubscription.initialise (_StripeSubscription));
_StripeFixedSubItem = (String)(HELPER_StripeFixedSubItem.initialise (_StripeFixedSubItem));
_StripeMeteredSubItem = (String)(HELPER_StripeMeteredSubItem.initialise (_StripeMeteredSubItem));
_NameOnCard = (String)(HELPER_NameOnCard.initialise (_NameOnCard)); _NameOnCard = (String)(HELPER_NameOnCard.initialise (_NameOnCard));
_CardPostCode = (String)(HELPER_CardPostCode.initialise (_CardPostCode)); _CardPostCode = (String)(HELPER_CardPostCode.initialise (_CardPostCode));
_CardID = (String)(HELPER_CardID.initialise (_CardID)); _CardID = (String)(HELPER_CardID.initialise (_CardID));
_PlanRenewedOn = (Date)(HELPER_PlanRenewedOn.initialise (_PlanRenewedOn)); _PlanRenewedOn = (Date)(HELPER_PlanRenewedOn.initialise (_PlanRenewedOn));
_UsedCredits = (Integer)(HELPER_UsedCredits.initialise (_UsedCredits)); _UsedCredits = (Integer)(HELPER_UsedCredits.initialise (_UsedCredits));
_AvailableCredits = (Integer)(HELPER_AvailableCredits.initialise (_AvailableCredits));
_IsPPJ = (Boolean)(Boolean.TRUE); _IsPPJ = (Boolean)(Boolean.TRUE);
_HasCap = (Boolean)(Boolean.FALSE); _HasCap = (Boolean)(Boolean.FALSE);
_MaxCap = (Integer)(HELPER_MaxCap.initialise (_MaxCap)); _MaxCap = (Integer)(HELPER_MaxCap.initialise (_MaxCap));
...@@ -2220,6 +2294,202 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -2220,6 +2294,202 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
/** /**
* Get the attribute StripeFixedSubItem
*/
public String getStripeFixedSubItem ()
{
assertValid();
String valToReturn = _StripeFixedSubItem;
for (HiringTeamBehaviourDecorator bhd : HiringTeam_BehaviourDecorators)
{
valToReturn = bhd.getStripeFixedSubItem ((HiringTeam)this, valToReturn);
}
return valToReturn;
}
/**
* Called prior to the attribute changing. Subclasses need not call super. If a field exception
* is thrown, the attribute change will fail. The new value is different to the old value.
*/
protected void preStripeFixedSubItemChange (String newStripeFixedSubItem) throws FieldException
{
}
/**
* Called after the attribute changes.
* If a field exception is thrown, the value is still changed, however it
* may lead to the TX being rolled back
*/
protected void postStripeFixedSubItemChange () throws FieldException
{
}
public FieldWriteability getWriteability_StripeFixedSubItem ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute StripeFixedSubItem. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setStripeFixedSubItem (String newStripeFixedSubItem) throws FieldException
{
boolean oldAndNewIdentical = HELPER_StripeFixedSubItem.compare (_StripeFixedSubItem, newStripeFixedSubItem);
try
{
for (HiringTeamBehaviourDecorator bhd : HiringTeam_BehaviourDecorators)
{
newStripeFixedSubItem = bhd.setStripeFixedSubItem ((HiringTeam)this, newStripeFixedSubItem);
oldAndNewIdentical = HELPER_StripeFixedSubItem.compare (_StripeFixedSubItem, newStripeFixedSubItem);
}
if (FIELD_StripeFixedSubItem_Validators.length > 0)
{
Object newStripeFixedSubItemObj = HELPER_StripeFixedSubItem.toObject (newStripeFixedSubItem);
if (newStripeFixedSubItemObj != null)
{
int loopMax = FIELD_StripeFixedSubItem_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_HiringTeam.get (FIELD_StripeFixedSubItem);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_StripeFixedSubItem_Validators[v].checkAttribute (this, FIELD_StripeFixedSubItem, metadata, newStripeFixedSubItemObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_StripeFixedSubItem () != FieldWriteability.FALSE, "Field StripeFixedSubItem is not writeable");
preStripeFixedSubItemChange (newStripeFixedSubItem);
markFieldChange (FIELD_StripeFixedSubItem);
_StripeFixedSubItem = newStripeFixedSubItem;
postFieldChange (FIELD_StripeFixedSubItem);
postStripeFixedSubItemChange ();
}
}
/**
* Get the attribute StripeMeteredSubItem
*/
public String getStripeMeteredSubItem ()
{
assertValid();
String valToReturn = _StripeMeteredSubItem;
for (HiringTeamBehaviourDecorator bhd : HiringTeam_BehaviourDecorators)
{
valToReturn = bhd.getStripeMeteredSubItem ((HiringTeam)this, valToReturn);
}
return valToReturn;
}
/**
* Called prior to the attribute changing. Subclasses need not call super. If a field exception
* is thrown, the attribute change will fail. The new value is different to the old value.
*/
protected void preStripeMeteredSubItemChange (String newStripeMeteredSubItem) throws FieldException
{
}
/**
* Called after the attribute changes.
* If a field exception is thrown, the value is still changed, however it
* may lead to the TX being rolled back
*/
protected void postStripeMeteredSubItemChange () throws FieldException
{
}
public FieldWriteability getWriteability_StripeMeteredSubItem ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute StripeMeteredSubItem. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setStripeMeteredSubItem (String newStripeMeteredSubItem) throws FieldException
{
boolean oldAndNewIdentical = HELPER_StripeMeteredSubItem.compare (_StripeMeteredSubItem, newStripeMeteredSubItem);
try
{
for (HiringTeamBehaviourDecorator bhd : HiringTeam_BehaviourDecorators)
{
newStripeMeteredSubItem = bhd.setStripeMeteredSubItem ((HiringTeam)this, newStripeMeteredSubItem);
oldAndNewIdentical = HELPER_StripeMeteredSubItem.compare (_StripeMeteredSubItem, newStripeMeteredSubItem);
}
if (FIELD_StripeMeteredSubItem_Validators.length > 0)
{
Object newStripeMeteredSubItemObj = HELPER_StripeMeteredSubItem.toObject (newStripeMeteredSubItem);
if (newStripeMeteredSubItemObj != null)
{
int loopMax = FIELD_StripeMeteredSubItem_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_HiringTeam.get (FIELD_StripeMeteredSubItem);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_StripeMeteredSubItem_Validators[v].checkAttribute (this, FIELD_StripeMeteredSubItem, metadata, newStripeMeteredSubItemObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_StripeMeteredSubItem () != FieldWriteability.FALSE, "Field StripeMeteredSubItem is not writeable");
preStripeMeteredSubItemChange (newStripeMeteredSubItem);
markFieldChange (FIELD_StripeMeteredSubItem);
_StripeMeteredSubItem = newStripeMeteredSubItem;
postFieldChange (FIELD_StripeMeteredSubItem);
postStripeMeteredSubItemChange ();
}
}
/**
* Get the attribute NameOnCard * Get the attribute NameOnCard
*/ */
public String getNameOnCard () public String getNameOnCard ()
...@@ -2710,6 +2980,104 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -2710,6 +2980,104 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
/** /**
* Get the attribute AvailableCredits
*/
public Integer getAvailableCredits ()
{
assertValid();
Integer valToReturn = _AvailableCredits;
for (HiringTeamBehaviourDecorator bhd : HiringTeam_BehaviourDecorators)
{
valToReturn = bhd.getAvailableCredits ((HiringTeam)this, valToReturn);
}
return valToReturn;
}
/**
* Called prior to the attribute changing. Subclasses need not call super. If a field exception
* is thrown, the attribute change will fail. The new value is different to the old value.
*/
protected void preAvailableCreditsChange (Integer newAvailableCredits) throws FieldException
{
}
/**
* Called after the attribute changes.
* If a field exception is thrown, the value is still changed, however it
* may lead to the TX being rolled back
*/
protected void postAvailableCreditsChange () throws FieldException
{
}
public FieldWriteability getWriteability_AvailableCredits ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute AvailableCredits. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setAvailableCredits (Integer newAvailableCredits) throws FieldException
{
boolean oldAndNewIdentical = HELPER_AvailableCredits.compare (_AvailableCredits, newAvailableCredits);
try
{
for (HiringTeamBehaviourDecorator bhd : HiringTeam_BehaviourDecorators)
{
newAvailableCredits = bhd.setAvailableCredits ((HiringTeam)this, newAvailableCredits);
oldAndNewIdentical = HELPER_AvailableCredits.compare (_AvailableCredits, newAvailableCredits);
}
if (FIELD_AvailableCredits_Validators.length > 0)
{
Object newAvailableCreditsObj = HELPER_AvailableCredits.toObject (newAvailableCredits);
if (newAvailableCreditsObj != null)
{
int loopMax = FIELD_AvailableCredits_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_HiringTeam.get (FIELD_AvailableCredits);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_AvailableCredits_Validators[v].checkAttribute (this, FIELD_AvailableCredits, metadata, newAvailableCreditsObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_AvailableCredits () != FieldWriteability.FALSE, "Field AvailableCredits is not writeable");
preAvailableCreditsChange (newAvailableCredits);
markFieldChange (FIELD_AvailableCredits);
_AvailableCredits = newAvailableCredits;
postFieldChange (FIELD_AvailableCredits);
postAvailableCreditsChange ();
}
}
/**
* Get the attribute IsPPJ * Get the attribute IsPPJ
*/ */
public Boolean getIsPPJ () public Boolean getIsPPJ ()
...@@ -4607,11 +4975,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -4607,11 +4975,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
tl_hiring_teamPSet.setAttrib (FIELD_ManageOwnBilling, HELPER_ManageOwnBilling.toObject (_ManageOwnBilling)); // tl_hiring_teamPSet.setAttrib (FIELD_ManageOwnBilling, HELPER_ManageOwnBilling.toObject (_ManageOwnBilling)); //
tl_hiring_teamPSet.setAttrib (FIELD_StripeReference, HELPER_StripeReference.toObject (_StripeReference)); // tl_hiring_teamPSet.setAttrib (FIELD_StripeReference, HELPER_StripeReference.toObject (_StripeReference)); //
tl_hiring_teamPSet.setAttrib (FIELD_StripeSubscription, HELPER_StripeSubscription.toObject (_StripeSubscription)); // tl_hiring_teamPSet.setAttrib (FIELD_StripeSubscription, HELPER_StripeSubscription.toObject (_StripeSubscription)); //
tl_hiring_teamPSet.setAttrib (FIELD_StripeFixedSubItem, HELPER_StripeFixedSubItem.toObject (_StripeFixedSubItem)); //
tl_hiring_teamPSet.setAttrib (FIELD_StripeMeteredSubItem, HELPER_StripeMeteredSubItem.toObject (_StripeMeteredSubItem)); //
tl_hiring_teamPSet.setAttrib (FIELD_NameOnCard, HELPER_NameOnCard.toObject (_NameOnCard)); // tl_hiring_teamPSet.setAttrib (FIELD_NameOnCard, HELPER_NameOnCard.toObject (_NameOnCard)); //
tl_hiring_teamPSet.setAttrib (FIELD_CardPostCode, HELPER_CardPostCode.toObject (_CardPostCode)); // tl_hiring_teamPSet.setAttrib (FIELD_CardPostCode, HELPER_CardPostCode.toObject (_CardPostCode)); //
tl_hiring_teamPSet.setAttrib (FIELD_CardID, HELPER_CardID.toObject (_CardID)); // tl_hiring_teamPSet.setAttrib (FIELD_CardID, HELPER_CardID.toObject (_CardID)); //
tl_hiring_teamPSet.setAttrib (FIELD_PlanRenewedOn, HELPER_PlanRenewedOn.toObject (_PlanRenewedOn)); // tl_hiring_teamPSet.setAttrib (FIELD_PlanRenewedOn, HELPER_PlanRenewedOn.toObject (_PlanRenewedOn)); //
tl_hiring_teamPSet.setAttrib (FIELD_UsedCredits, HELPER_UsedCredits.toObject (_UsedCredits)); // tl_hiring_teamPSet.setAttrib (FIELD_UsedCredits, HELPER_UsedCredits.toObject (_UsedCredits)); //
tl_hiring_teamPSet.setAttrib (FIELD_AvailableCredits, HELPER_AvailableCredits.toObject (_AvailableCredits)); //
tl_hiring_teamPSet.setAttrib (FIELD_IsPPJ, HELPER_IsPPJ.toObject (_IsPPJ)); // tl_hiring_teamPSet.setAttrib (FIELD_IsPPJ, HELPER_IsPPJ.toObject (_IsPPJ)); //
tl_hiring_teamPSet.setAttrib (FIELD_HasCap, HELPER_HasCap.toObject (_HasCap)); // tl_hiring_teamPSet.setAttrib (FIELD_HasCap, HELPER_HasCap.toObject (_HasCap)); //
tl_hiring_teamPSet.setAttrib (FIELD_MaxCap, HELPER_MaxCap.toObject (_MaxCap)); // tl_hiring_teamPSet.setAttrib (FIELD_MaxCap, HELPER_MaxCap.toObject (_MaxCap)); //
...@@ -4648,11 +5019,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -4648,11 +5019,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
_ManageOwnBilling = (Boolean)(HELPER_ManageOwnBilling.fromObject (_ManageOwnBilling, tl_hiring_teamPSet.getAttrib (FIELD_ManageOwnBilling))); // _ManageOwnBilling = (Boolean)(HELPER_ManageOwnBilling.fromObject (_ManageOwnBilling, tl_hiring_teamPSet.getAttrib (FIELD_ManageOwnBilling))); //
_StripeReference = (String)(HELPER_StripeReference.fromObject (_StripeReference, tl_hiring_teamPSet.getAttrib (FIELD_StripeReference))); // _StripeReference = (String)(HELPER_StripeReference.fromObject (_StripeReference, tl_hiring_teamPSet.getAttrib (FIELD_StripeReference))); //
_StripeSubscription = (String)(HELPER_StripeSubscription.fromObject (_StripeSubscription, tl_hiring_teamPSet.getAttrib (FIELD_StripeSubscription))); // _StripeSubscription = (String)(HELPER_StripeSubscription.fromObject (_StripeSubscription, tl_hiring_teamPSet.getAttrib (FIELD_StripeSubscription))); //
_StripeFixedSubItem = (String)(HELPER_StripeFixedSubItem.fromObject (_StripeFixedSubItem, tl_hiring_teamPSet.getAttrib (FIELD_StripeFixedSubItem))); //
_StripeMeteredSubItem = (String)(HELPER_StripeMeteredSubItem.fromObject (_StripeMeteredSubItem, tl_hiring_teamPSet.getAttrib (FIELD_StripeMeteredSubItem))); //
_NameOnCard = (String)(HELPER_NameOnCard.fromObject (_NameOnCard, tl_hiring_teamPSet.getAttrib (FIELD_NameOnCard))); // _NameOnCard = (String)(HELPER_NameOnCard.fromObject (_NameOnCard, tl_hiring_teamPSet.getAttrib (FIELD_NameOnCard))); //
_CardPostCode = (String)(HELPER_CardPostCode.fromObject (_CardPostCode, tl_hiring_teamPSet.getAttrib (FIELD_CardPostCode))); // _CardPostCode = (String)(HELPER_CardPostCode.fromObject (_CardPostCode, tl_hiring_teamPSet.getAttrib (FIELD_CardPostCode))); //
_CardID = (String)(HELPER_CardID.fromObject (_CardID, tl_hiring_teamPSet.getAttrib (FIELD_CardID))); // _CardID = (String)(HELPER_CardID.fromObject (_CardID, tl_hiring_teamPSet.getAttrib (FIELD_CardID))); //
_PlanRenewedOn = (Date)(HELPER_PlanRenewedOn.fromObject (_PlanRenewedOn, tl_hiring_teamPSet.getAttrib (FIELD_PlanRenewedOn))); // _PlanRenewedOn = (Date)(HELPER_PlanRenewedOn.fromObject (_PlanRenewedOn, tl_hiring_teamPSet.getAttrib (FIELD_PlanRenewedOn))); //
_UsedCredits = (Integer)(HELPER_UsedCredits.fromObject (_UsedCredits, tl_hiring_teamPSet.getAttrib (FIELD_UsedCredits))); // _UsedCredits = (Integer)(HELPER_UsedCredits.fromObject (_UsedCredits, tl_hiring_teamPSet.getAttrib (FIELD_UsedCredits))); //
_AvailableCredits = (Integer)(HELPER_AvailableCredits.fromObject (_AvailableCredits, tl_hiring_teamPSet.getAttrib (FIELD_AvailableCredits))); //
_IsPPJ = (Boolean)(HELPER_IsPPJ.fromObject (_IsPPJ, tl_hiring_teamPSet.getAttrib (FIELD_IsPPJ))); // _IsPPJ = (Boolean)(HELPER_IsPPJ.fromObject (_IsPPJ, tl_hiring_teamPSet.getAttrib (FIELD_IsPPJ))); //
_HasCap = (Boolean)(HELPER_HasCap.fromObject (_HasCap, tl_hiring_teamPSet.getAttrib (FIELD_HasCap))); // _HasCap = (Boolean)(HELPER_HasCap.fromObject (_HasCap, tl_hiring_teamPSet.getAttrib (FIELD_HasCap))); //
_MaxCap = (Integer)(HELPER_MaxCap.fromObject (_MaxCap, tl_hiring_teamPSet.getAttrib (FIELD_MaxCap))); // _MaxCap = (Integer)(HELPER_MaxCap.fromObject (_MaxCap, tl_hiring_teamPSet.getAttrib (FIELD_MaxCap))); //
...@@ -4796,6 +5170,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -4796,6 +5170,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
try try
{ {
setStripeFixedSubItem (otherHiringTeam.getStripeFixedSubItem ());
}
catch (FieldException ex)
{
e.addException (ex);
}
try
{
setStripeMeteredSubItem (otherHiringTeam.getStripeMeteredSubItem ());
}
catch (FieldException ex)
{
e.addException (ex);
}
try
{
setNameOnCard (otherHiringTeam.getNameOnCard ()); setNameOnCard (otherHiringTeam.getNameOnCard ());
} }
catch (FieldException ex) catch (FieldException ex)
...@@ -4841,6 +5233,15 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -4841,6 +5233,15 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
try try
{ {
setAvailableCredits (otherHiringTeam.getAvailableCredits ());
}
catch (FieldException ex)
{
e.addException (ex);
}
try
{
setIsPPJ (otherHiringTeam.getIsPPJ ()); setIsPPJ (otherHiringTeam.getIsPPJ ());
} }
catch (FieldException ex) catch (FieldException ex)
...@@ -4903,11 +5304,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -4903,11 +5304,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
_ManageOwnBilling = sourceHiringTeam._ManageOwnBilling; _ManageOwnBilling = sourceHiringTeam._ManageOwnBilling;
_StripeReference = sourceHiringTeam._StripeReference; _StripeReference = sourceHiringTeam._StripeReference;
_StripeSubscription = sourceHiringTeam._StripeSubscription; _StripeSubscription = sourceHiringTeam._StripeSubscription;
_StripeFixedSubItem = sourceHiringTeam._StripeFixedSubItem;
_StripeMeteredSubItem = sourceHiringTeam._StripeMeteredSubItem;
_NameOnCard = sourceHiringTeam._NameOnCard; _NameOnCard = sourceHiringTeam._NameOnCard;
_CardPostCode = sourceHiringTeam._CardPostCode; _CardPostCode = sourceHiringTeam._CardPostCode;
_CardID = sourceHiringTeam._CardID; _CardID = sourceHiringTeam._CardID;
_PlanRenewedOn = sourceHiringTeam._PlanRenewedOn; _PlanRenewedOn = sourceHiringTeam._PlanRenewedOn;
_UsedCredits = sourceHiringTeam._UsedCredits; _UsedCredits = sourceHiringTeam._UsedCredits;
_AvailableCredits = sourceHiringTeam._AvailableCredits;
_IsPPJ = sourceHiringTeam._IsPPJ; _IsPPJ = sourceHiringTeam._IsPPJ;
_HasCap = sourceHiringTeam._HasCap; _HasCap = sourceHiringTeam._HasCap;
_MaxCap = sourceHiringTeam._MaxCap; _MaxCap = sourceHiringTeam._MaxCap;
...@@ -4992,11 +5396,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -4992,11 +5396,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
_ManageOwnBilling = (Boolean)(HELPER_ManageOwnBilling.readExternal (_ManageOwnBilling, vals.get(FIELD_ManageOwnBilling))); // _ManageOwnBilling = (Boolean)(HELPER_ManageOwnBilling.readExternal (_ManageOwnBilling, vals.get(FIELD_ManageOwnBilling))); //
_StripeReference = (String)(HELPER_StripeReference.readExternal (_StripeReference, vals.get(FIELD_StripeReference))); // _StripeReference = (String)(HELPER_StripeReference.readExternal (_StripeReference, vals.get(FIELD_StripeReference))); //
_StripeSubscription = (String)(HELPER_StripeSubscription.readExternal (_StripeSubscription, vals.get(FIELD_StripeSubscription))); // _StripeSubscription = (String)(HELPER_StripeSubscription.readExternal (_StripeSubscription, vals.get(FIELD_StripeSubscription))); //
_StripeFixedSubItem = (String)(HELPER_StripeFixedSubItem.readExternal (_StripeFixedSubItem, vals.get(FIELD_StripeFixedSubItem))); //
_StripeMeteredSubItem = (String)(HELPER_StripeMeteredSubItem.readExternal (_StripeMeteredSubItem, vals.get(FIELD_StripeMeteredSubItem))); //
_NameOnCard = (String)(HELPER_NameOnCard.readExternal (_NameOnCard, vals.get(FIELD_NameOnCard))); // _NameOnCard = (String)(HELPER_NameOnCard.readExternal (_NameOnCard, vals.get(FIELD_NameOnCard))); //
_CardPostCode = (String)(HELPER_CardPostCode.readExternal (_CardPostCode, vals.get(FIELD_CardPostCode))); // _CardPostCode = (String)(HELPER_CardPostCode.readExternal (_CardPostCode, vals.get(FIELD_CardPostCode))); //
_CardID = (String)(HELPER_CardID.readExternal (_CardID, vals.get(FIELD_CardID))); // _CardID = (String)(HELPER_CardID.readExternal (_CardID, vals.get(FIELD_CardID))); //
_PlanRenewedOn = (Date)(HELPER_PlanRenewedOn.readExternal (_PlanRenewedOn, vals.get(FIELD_PlanRenewedOn))); // _PlanRenewedOn = (Date)(HELPER_PlanRenewedOn.readExternal (_PlanRenewedOn, vals.get(FIELD_PlanRenewedOn))); //
_UsedCredits = (Integer)(HELPER_UsedCredits.readExternal (_UsedCredits, vals.get(FIELD_UsedCredits))); // _UsedCredits = (Integer)(HELPER_UsedCredits.readExternal (_UsedCredits, vals.get(FIELD_UsedCredits))); //
_AvailableCredits = (Integer)(HELPER_AvailableCredits.readExternal (_AvailableCredits, vals.get(FIELD_AvailableCredits))); //
_IsPPJ = (Boolean)(HELPER_IsPPJ.readExternal (_IsPPJ, vals.get(FIELD_IsPPJ))); // _IsPPJ = (Boolean)(HELPER_IsPPJ.readExternal (_IsPPJ, vals.get(FIELD_IsPPJ))); //
_HasCap = (Boolean)(HELPER_HasCap.readExternal (_HasCap, vals.get(FIELD_HasCap))); // _HasCap = (Boolean)(HELPER_HasCap.readExternal (_HasCap, vals.get(FIELD_HasCap))); //
_MaxCap = (Integer)(HELPER_MaxCap.readExternal (_MaxCap, vals.get(FIELD_MaxCap))); // _MaxCap = (Integer)(HELPER_MaxCap.readExternal (_MaxCap, vals.get(FIELD_MaxCap))); //
...@@ -5036,11 +5443,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5036,11 +5443,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
vals.put (FIELD_ManageOwnBilling, HELPER_ManageOwnBilling.writeExternal (_ManageOwnBilling)); vals.put (FIELD_ManageOwnBilling, HELPER_ManageOwnBilling.writeExternal (_ManageOwnBilling));
vals.put (FIELD_StripeReference, HELPER_StripeReference.writeExternal (_StripeReference)); vals.put (FIELD_StripeReference, HELPER_StripeReference.writeExternal (_StripeReference));
vals.put (FIELD_StripeSubscription, HELPER_StripeSubscription.writeExternal (_StripeSubscription)); vals.put (FIELD_StripeSubscription, HELPER_StripeSubscription.writeExternal (_StripeSubscription));
vals.put (FIELD_StripeFixedSubItem, HELPER_StripeFixedSubItem.writeExternal (_StripeFixedSubItem));
vals.put (FIELD_StripeMeteredSubItem, HELPER_StripeMeteredSubItem.writeExternal (_StripeMeteredSubItem));
vals.put (FIELD_NameOnCard, HELPER_NameOnCard.writeExternal (_NameOnCard)); vals.put (FIELD_NameOnCard, HELPER_NameOnCard.writeExternal (_NameOnCard));
vals.put (FIELD_CardPostCode, HELPER_CardPostCode.writeExternal (_CardPostCode)); vals.put (FIELD_CardPostCode, HELPER_CardPostCode.writeExternal (_CardPostCode));
vals.put (FIELD_CardID, HELPER_CardID.writeExternal (_CardID)); vals.put (FIELD_CardID, HELPER_CardID.writeExternal (_CardID));
vals.put (FIELD_PlanRenewedOn, HELPER_PlanRenewedOn.writeExternal (_PlanRenewedOn)); vals.put (FIELD_PlanRenewedOn, HELPER_PlanRenewedOn.writeExternal (_PlanRenewedOn));
vals.put (FIELD_UsedCredits, HELPER_UsedCredits.writeExternal (_UsedCredits)); vals.put (FIELD_UsedCredits, HELPER_UsedCredits.writeExternal (_UsedCredits));
vals.put (FIELD_AvailableCredits, HELPER_AvailableCredits.writeExternal (_AvailableCredits));
vals.put (FIELD_IsPPJ, HELPER_IsPPJ.writeExternal (_IsPPJ)); vals.put (FIELD_IsPPJ, HELPER_IsPPJ.writeExternal (_IsPPJ));
vals.put (FIELD_HasCap, HELPER_HasCap.writeExternal (_HasCap)); vals.put (FIELD_HasCap, HELPER_HasCap.writeExternal (_HasCap));
vals.put (FIELD_MaxCap, HELPER_MaxCap.writeExternal (_MaxCap)); vals.put (FIELD_MaxCap, HELPER_MaxCap.writeExternal (_MaxCap));
...@@ -5121,6 +5531,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5121,6 +5531,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
listener.notifyFieldChange(this, other, FIELD_StripeSubscription, HELPER_StripeSubscription.toObject(this._StripeSubscription), HELPER_StripeSubscription.toObject(otherHiringTeam._StripeSubscription)); listener.notifyFieldChange(this, other, FIELD_StripeSubscription, HELPER_StripeSubscription.toObject(this._StripeSubscription), HELPER_StripeSubscription.toObject(otherHiringTeam._StripeSubscription));
} }
if (!HELPER_StripeFixedSubItem.compare(this._StripeFixedSubItem, otherHiringTeam._StripeFixedSubItem))
{
listener.notifyFieldChange(this, other, FIELD_StripeFixedSubItem, HELPER_StripeFixedSubItem.toObject(this._StripeFixedSubItem), HELPER_StripeFixedSubItem.toObject(otherHiringTeam._StripeFixedSubItem));
}
if (!HELPER_StripeMeteredSubItem.compare(this._StripeMeteredSubItem, otherHiringTeam._StripeMeteredSubItem))
{
listener.notifyFieldChange(this, other, FIELD_StripeMeteredSubItem, HELPER_StripeMeteredSubItem.toObject(this._StripeMeteredSubItem), HELPER_StripeMeteredSubItem.toObject(otherHiringTeam._StripeMeteredSubItem));
}
if (!HELPER_NameOnCard.compare(this._NameOnCard, otherHiringTeam._NameOnCard)) if (!HELPER_NameOnCard.compare(this._NameOnCard, otherHiringTeam._NameOnCard))
{ {
listener.notifyFieldChange(this, other, FIELD_NameOnCard, HELPER_NameOnCard.toObject(this._NameOnCard), HELPER_NameOnCard.toObject(otherHiringTeam._NameOnCard)); listener.notifyFieldChange(this, other, FIELD_NameOnCard, HELPER_NameOnCard.toObject(this._NameOnCard), HELPER_NameOnCard.toObject(otherHiringTeam._NameOnCard));
...@@ -5141,6 +5559,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5141,6 +5559,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
listener.notifyFieldChange(this, other, FIELD_UsedCredits, HELPER_UsedCredits.toObject(this._UsedCredits), HELPER_UsedCredits.toObject(otherHiringTeam._UsedCredits)); listener.notifyFieldChange(this, other, FIELD_UsedCredits, HELPER_UsedCredits.toObject(this._UsedCredits), HELPER_UsedCredits.toObject(otherHiringTeam._UsedCredits));
} }
if (!HELPER_AvailableCredits.compare(this._AvailableCredits, otherHiringTeam._AvailableCredits))
{
listener.notifyFieldChange(this, other, FIELD_AvailableCredits, HELPER_AvailableCredits.toObject(this._AvailableCredits), HELPER_AvailableCredits.toObject(otherHiringTeam._AvailableCredits));
}
if (!HELPER_IsPPJ.compare(this._IsPPJ, otherHiringTeam._IsPPJ)) if (!HELPER_IsPPJ.compare(this._IsPPJ, otherHiringTeam._IsPPJ))
{ {
listener.notifyFieldChange(this, other, FIELD_IsPPJ, HELPER_IsPPJ.toObject(this._IsPPJ), HELPER_IsPPJ.toObject(otherHiringTeam._IsPPJ)); listener.notifyFieldChange(this, other, FIELD_IsPPJ, HELPER_IsPPJ.toObject(this._IsPPJ), HELPER_IsPPJ.toObject(otherHiringTeam._IsPPJ));
...@@ -5203,11 +5625,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5203,11 +5625,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
visitor.visitField(this, FIELD_ManageOwnBilling, HELPER_ManageOwnBilling.toObject(getManageOwnBilling())); visitor.visitField(this, FIELD_ManageOwnBilling, HELPER_ManageOwnBilling.toObject(getManageOwnBilling()));
visitor.visitField(this, FIELD_StripeReference, HELPER_StripeReference.toObject(getStripeReference())); visitor.visitField(this, FIELD_StripeReference, HELPER_StripeReference.toObject(getStripeReference()));
visitor.visitField(this, FIELD_StripeSubscription, HELPER_StripeSubscription.toObject(getStripeSubscription())); visitor.visitField(this, FIELD_StripeSubscription, HELPER_StripeSubscription.toObject(getStripeSubscription()));
visitor.visitField(this, FIELD_StripeFixedSubItem, HELPER_StripeFixedSubItem.toObject(getStripeFixedSubItem()));
visitor.visitField(this, FIELD_StripeMeteredSubItem, HELPER_StripeMeteredSubItem.toObject(getStripeMeteredSubItem()));
visitor.visitField(this, FIELD_NameOnCard, HELPER_NameOnCard.toObject(getNameOnCard())); visitor.visitField(this, FIELD_NameOnCard, HELPER_NameOnCard.toObject(getNameOnCard()));
visitor.visitField(this, FIELD_CardPostCode, HELPER_CardPostCode.toObject(getCardPostCode())); visitor.visitField(this, FIELD_CardPostCode, HELPER_CardPostCode.toObject(getCardPostCode()));
visitor.visitField(this, FIELD_CardID, HELPER_CardID.toObject(getCardID())); visitor.visitField(this, FIELD_CardID, HELPER_CardID.toObject(getCardID()));
visitor.visitField(this, FIELD_PlanRenewedOn, HELPER_PlanRenewedOn.toObject(getPlanRenewedOn())); visitor.visitField(this, FIELD_PlanRenewedOn, HELPER_PlanRenewedOn.toObject(getPlanRenewedOn()));
visitor.visitField(this, FIELD_UsedCredits, HELPER_UsedCredits.toObject(getUsedCredits())); visitor.visitField(this, FIELD_UsedCredits, HELPER_UsedCredits.toObject(getUsedCredits()));
visitor.visitField(this, FIELD_AvailableCredits, HELPER_AvailableCredits.toObject(getAvailableCredits()));
visitor.visitField(this, FIELD_IsPPJ, HELPER_IsPPJ.toObject(getIsPPJ())); visitor.visitField(this, FIELD_IsPPJ, HELPER_IsPPJ.toObject(getIsPPJ()));
visitor.visitField(this, FIELD_HasCap, HELPER_HasCap.toObject(getHasCap())); visitor.visitField(this, FIELD_HasCap, HELPER_HasCap.toObject(getHasCap()));
visitor.visitField(this, FIELD_MaxCap, HELPER_MaxCap.toObject(getMaxCap())); visitor.visitField(this, FIELD_MaxCap, HELPER_MaxCap.toObject(getMaxCap()));
...@@ -5332,6 +5757,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5332,6 +5757,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return filter.matches (getStripeSubscription ()); return filter.matches (getStripeSubscription ());
} }
else if (attribName.equals (FIELD_StripeFixedSubItem))
{
return filter.matches (getStripeFixedSubItem ());
}
else if (attribName.equals (FIELD_StripeMeteredSubItem))
{
return filter.matches (getStripeMeteredSubItem ());
}
else if (attribName.equals (FIELD_NameOnCard)) else if (attribName.equals (FIELD_NameOnCard))
{ {
return filter.matches (getNameOnCard ()); return filter.matches (getNameOnCard ());
...@@ -5352,6 +5785,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5352,6 +5785,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return filter.matches (getUsedCredits ()); return filter.matches (getUsedCredits ());
} }
else if (attribName.equals (FIELD_AvailableCredits))
{
return filter.matches (getAvailableCredits ());
}
else if (attribName.equals (FIELD_IsPPJ)) else if (attribName.equals (FIELD_IsPPJ))
{ {
return filter.matches (getIsPPJ ()); return filter.matches (getIsPPJ ());
...@@ -5497,6 +5934,18 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5497,6 +5934,18 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
return this; return this;
} }
public SearchAll andStripeFixedSubItem (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.stripe_fixed_sub_item", "StripeFixedSubItem");
return this;
}
public SearchAll andStripeMeteredSubItem (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.stripe_metered_sub_item", "StripeMeteredSubItem");
return this;
}
public SearchAll andNameOnCard (QueryFilter<String> filter) public SearchAll andNameOnCard (QueryFilter<String> filter)
{ {
filter.addFilter (context, "tl_hiring_team.name_on_card", "NameOnCard"); filter.addFilter (context, "tl_hiring_team.name_on_card", "NameOnCard");
...@@ -5527,6 +5976,12 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5527,6 +5976,12 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
return this; return this;
} }
public SearchAll andAvailableCredits (QueryFilter<Integer> filter)
{
filter.addFilter (context, "tl_hiring_team.available_credits", "AvailableCredits");
return this;
}
public SearchAll andIsPPJ (QueryFilter<Boolean> filter) public SearchAll andIsPPJ (QueryFilter<Boolean> filter)
{ {
filter.addFilter (context, "tl_hiring_team.is_ppj", "IsPPJ"); filter.addFilter (context, "tl_hiring_team.is_ppj", "IsPPJ");
...@@ -5668,6 +6123,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5668,6 +6123,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return HELPER_StripeSubscription.toObject (getStripeSubscription ()); return HELPER_StripeSubscription.toObject (getStripeSubscription ());
} }
else if (attribName.equals (FIELD_StripeFixedSubItem))
{
return HELPER_StripeFixedSubItem.toObject (getStripeFixedSubItem ());
}
else if (attribName.equals (FIELD_StripeMeteredSubItem))
{
return HELPER_StripeMeteredSubItem.toObject (getStripeMeteredSubItem ());
}
else if (attribName.equals (FIELD_NameOnCard)) else if (attribName.equals (FIELD_NameOnCard))
{ {
return HELPER_NameOnCard.toObject (getNameOnCard ()); return HELPER_NameOnCard.toObject (getNameOnCard ());
...@@ -5688,6 +6151,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5688,6 +6151,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return HELPER_UsedCredits.toObject (getUsedCredits ()); return HELPER_UsedCredits.toObject (getUsedCredits ());
} }
else if (attribName.equals (FIELD_AvailableCredits))
{
return HELPER_AvailableCredits.toObject (getAvailableCredits ());
}
else if (attribName.equals (FIELD_IsPPJ)) else if (attribName.equals (FIELD_IsPPJ))
{ {
return HELPER_IsPPJ.toObject (getIsPPJ ()); return HELPER_IsPPJ.toObject (getIsPPJ ());
...@@ -5785,6 +6252,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5785,6 +6252,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return HELPER_StripeSubscription; return HELPER_StripeSubscription;
} }
else if (attribName.equals (FIELD_StripeFixedSubItem))
{
return HELPER_StripeFixedSubItem;
}
else if (attribName.equals (FIELD_StripeMeteredSubItem))
{
return HELPER_StripeMeteredSubItem;
}
else if (attribName.equals (FIELD_NameOnCard)) else if (attribName.equals (FIELD_NameOnCard))
{ {
return HELPER_NameOnCard; return HELPER_NameOnCard;
...@@ -5805,6 +6280,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5805,6 +6280,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return HELPER_UsedCredits; return HELPER_UsedCredits;
} }
else if (attribName.equals (FIELD_AvailableCredits))
{
return HELPER_AvailableCredits;
}
else if (attribName.equals (FIELD_IsPPJ)) else if (attribName.equals (FIELD_IsPPJ))
{ {
return HELPER_IsPPJ; return HELPER_IsPPJ;
...@@ -5902,6 +6381,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5902,6 +6381,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
setStripeSubscription ((String)(HELPER_StripeSubscription.fromObject (_StripeSubscription, attribValue))); setStripeSubscription ((String)(HELPER_StripeSubscription.fromObject (_StripeSubscription, attribValue)));
} }
else if (attribName.equals (FIELD_StripeFixedSubItem))
{
setStripeFixedSubItem ((String)(HELPER_StripeFixedSubItem.fromObject (_StripeFixedSubItem, attribValue)));
}
else if (attribName.equals (FIELD_StripeMeteredSubItem))
{
setStripeMeteredSubItem ((String)(HELPER_StripeMeteredSubItem.fromObject (_StripeMeteredSubItem, attribValue)));
}
else if (attribName.equals (FIELD_NameOnCard)) else if (attribName.equals (FIELD_NameOnCard))
{ {
setNameOnCard ((String)(HELPER_NameOnCard.fromObject (_NameOnCard, attribValue))); setNameOnCard ((String)(HELPER_NameOnCard.fromObject (_NameOnCard, attribValue)));
...@@ -5922,6 +6409,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5922,6 +6409,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
setUsedCredits ((Integer)(HELPER_UsedCredits.fromObject (_UsedCredits, attribValue))); setUsedCredits ((Integer)(HELPER_UsedCredits.fromObject (_UsedCredits, attribValue)));
} }
else if (attribName.equals (FIELD_AvailableCredits))
{
setAvailableCredits ((Integer)(HELPER_AvailableCredits.fromObject (_AvailableCredits, attribValue)));
}
else if (attribName.equals (FIELD_IsPPJ)) else if (attribName.equals (FIELD_IsPPJ))
{ {
setIsPPJ ((Boolean)(HELPER_IsPPJ.fromObject (_IsPPJ, attribValue))); setIsPPJ ((Boolean)(HELPER_IsPPJ.fromObject (_IsPPJ, attribValue)));
...@@ -6026,6 +6517,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6026,6 +6517,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return getWriteability_StripeSubscription (); return getWriteability_StripeSubscription ();
} }
else if (fieldName.equals (FIELD_StripeFixedSubItem))
{
return getWriteability_StripeFixedSubItem ();
}
else if (fieldName.equals (FIELD_StripeMeteredSubItem))
{
return getWriteability_StripeMeteredSubItem ();
}
else if (fieldName.equals (FIELD_NameOnCard)) else if (fieldName.equals (FIELD_NameOnCard))
{ {
return getWriteability_NameOnCard (); return getWriteability_NameOnCard ();
...@@ -6046,6 +6545,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6046,6 +6545,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return getWriteability_UsedCredits (); return getWriteability_UsedCredits ();
} }
else if (fieldName.equals (FIELD_AvailableCredits))
{
return getWriteability_AvailableCredits ();
}
else if (fieldName.equals (FIELD_IsPPJ)) else if (fieldName.equals (FIELD_IsPPJ))
{ {
return getWriteability_IsPPJ (); return getWriteability_IsPPJ ();
...@@ -6181,6 +6684,16 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6181,6 +6684,16 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
fields.add (FIELD_StripeSubscription); fields.add (FIELD_StripeSubscription);
} }
if (getWriteability_StripeFixedSubItem () != FieldWriteability.TRUE)
{
fields.add (FIELD_StripeFixedSubItem);
}
if (getWriteability_StripeMeteredSubItem () != FieldWriteability.TRUE)
{
fields.add (FIELD_StripeMeteredSubItem);
}
if (getWriteability_NameOnCard () != FieldWriteability.TRUE) if (getWriteability_NameOnCard () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_NameOnCard); fields.add (FIELD_NameOnCard);
...@@ -6206,6 +6719,11 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6206,6 +6719,11 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
fields.add (FIELD_UsedCredits); fields.add (FIELD_UsedCredits);
} }
if (getWriteability_AvailableCredits () != FieldWriteability.TRUE)
{
fields.add (FIELD_AvailableCredits);
}
if (getWriteability_IsPPJ () != FieldWriteability.TRUE) if (getWriteability_IsPPJ () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_IsPPJ); fields.add (FIELD_IsPPJ);
...@@ -6268,11 +6786,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6268,11 +6786,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
result.add(HELPER_ManageOwnBilling.getAttribObject (getClass (), _ManageOwnBilling, false, FIELD_ManageOwnBilling)); result.add(HELPER_ManageOwnBilling.getAttribObject (getClass (), _ManageOwnBilling, false, FIELD_ManageOwnBilling));
result.add(HELPER_StripeReference.getAttribObject (getClass (), _StripeReference, false, FIELD_StripeReference)); result.add(HELPER_StripeReference.getAttribObject (getClass (), _StripeReference, false, FIELD_StripeReference));
result.add(HELPER_StripeSubscription.getAttribObject (getClass (), _StripeSubscription, false, FIELD_StripeSubscription)); result.add(HELPER_StripeSubscription.getAttribObject (getClass (), _StripeSubscription, false, FIELD_StripeSubscription));
result.add(HELPER_StripeFixedSubItem.getAttribObject (getClass (), _StripeFixedSubItem, false, FIELD_StripeFixedSubItem));
result.add(HELPER_StripeMeteredSubItem.getAttribObject (getClass (), _StripeMeteredSubItem, false, FIELD_StripeMeteredSubItem));
result.add(HELPER_NameOnCard.getAttribObject (getClass (), _NameOnCard, false, FIELD_NameOnCard)); result.add(HELPER_NameOnCard.getAttribObject (getClass (), _NameOnCard, false, FIELD_NameOnCard));
result.add(HELPER_CardPostCode.getAttribObject (getClass (), _CardPostCode, false, FIELD_CardPostCode)); result.add(HELPER_CardPostCode.getAttribObject (getClass (), _CardPostCode, false, FIELD_CardPostCode));
result.add(HELPER_CardID.getAttribObject (getClass (), _CardID, false, FIELD_CardID)); result.add(HELPER_CardID.getAttribObject (getClass (), _CardID, false, FIELD_CardID));
result.add(HELPER_PlanRenewedOn.getAttribObject (getClass (), _PlanRenewedOn, false, FIELD_PlanRenewedOn)); result.add(HELPER_PlanRenewedOn.getAttribObject (getClass (), _PlanRenewedOn, false, FIELD_PlanRenewedOn));
result.add(HELPER_UsedCredits.getAttribObject (getClass (), _UsedCredits, false, FIELD_UsedCredits)); result.add(HELPER_UsedCredits.getAttribObject (getClass (), _UsedCredits, false, FIELD_UsedCredits));
result.add(HELPER_AvailableCredits.getAttribObject (getClass (), _AvailableCredits, false, FIELD_AvailableCredits));
result.add(HELPER_IsPPJ.getAttribObject (getClass (), _IsPPJ, false, FIELD_IsPPJ)); result.add(HELPER_IsPPJ.getAttribObject (getClass (), _IsPPJ, false, FIELD_IsPPJ));
result.add(HELPER_HasCap.getAttribObject (getClass (), _HasCap, false, FIELD_HasCap)); result.add(HELPER_HasCap.getAttribObject (getClass (), _HasCap, false, FIELD_HasCap));
result.add(HELPER_MaxCap.getAttribObject (getClass (), _MaxCap, false, FIELD_MaxCap)); result.add(HELPER_MaxCap.getAttribObject (getClass (), _MaxCap, false, FIELD_MaxCap));
...@@ -6584,6 +7105,42 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6584,6 +7105,42 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
/** /**
* Get the attribute StripeFixedSubItem
*/
public String getStripeFixedSubItem (HiringTeam obj, String original)
{
return original;
}
/**
* Change the value set for attribute StripeFixedSubItem.
* May modify the field beforehand
* Occurs before validation.
*/
public String setStripeFixedSubItem (HiringTeam obj, String newStripeFixedSubItem) throws FieldException
{
return newStripeFixedSubItem;
}
/**
* Get the attribute StripeMeteredSubItem
*/
public String getStripeMeteredSubItem (HiringTeam obj, String original)
{
return original;
}
/**
* Change the value set for attribute StripeMeteredSubItem.
* May modify the field beforehand
* Occurs before validation.
*/
public String setStripeMeteredSubItem (HiringTeam obj, String newStripeMeteredSubItem) throws FieldException
{
return newStripeMeteredSubItem;
}
/**
* Get the attribute NameOnCard * Get the attribute NameOnCard
*/ */
public String getNameOnCard (HiringTeam obj, String original) public String getNameOnCard (HiringTeam obj, String original)
...@@ -6674,6 +7231,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6674,6 +7231,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
/** /**
* Get the attribute AvailableCredits
*/
public Integer getAvailableCredits (HiringTeam obj, Integer original)
{
return original;
}
/**
* Change the value set for attribute AvailableCredits.
* May modify the field beforehand
* Occurs before validation.
*/
public Integer setAvailableCredits (HiringTeam obj, Integer newAvailableCredits) throws FieldException
{
return newAvailableCredits;
}
/**
* Get the attribute IsPPJ * Get the attribute IsPPJ
*/ */
public Boolean getIsPPJ (HiringTeam obj, Boolean original) public Boolean getIsPPJ (HiringTeam obj, Boolean original)
...@@ -6945,6 +7520,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6945,6 +7520,14 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return toStripeSubscription (); return toStripeSubscription ();
} }
if (name.equals ("StripeFixedSubItem"))
{
return toStripeFixedSubItem ();
}
if (name.equals ("StripeMeteredSubItem"))
{
return toStripeMeteredSubItem ();
}
if (name.equals ("NameOnCard")) if (name.equals ("NameOnCard"))
{ {
return toNameOnCard (); return toNameOnCard ();
...@@ -6965,6 +7548,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -6965,6 +7548,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return toUsedCredits (); return toUsedCredits ();
} }
if (name.equals ("AvailableCredits"))
{
return toAvailableCredits ();
}
if (name.equals ("IsPPJ")) if (name.equals ("IsPPJ"))
{ {
return toIsPPJ (); return toIsPPJ ();
...@@ -7041,6 +7628,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -7041,6 +7628,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
public PipeLine<From, String> toStripeSubscription () { return pipe(new ORMAttributePipe<Me, String>(FIELD_StripeSubscription)); } public PipeLine<From, String> toStripeSubscription () { return pipe(new ORMAttributePipe<Me, String>(FIELD_StripeSubscription)); }
public PipeLine<From, String> toStripeFixedSubItem () { return pipe(new ORMAttributePipe<Me, String>(FIELD_StripeFixedSubItem)); }
public PipeLine<From, String> toStripeMeteredSubItem () { return pipe(new ORMAttributePipe<Me, String>(FIELD_StripeMeteredSubItem)); }
public PipeLine<From, String> toNameOnCard () { return pipe(new ORMAttributePipe<Me, String>(FIELD_NameOnCard)); } public PipeLine<From, String> toNameOnCard () { return pipe(new ORMAttributePipe<Me, String>(FIELD_NameOnCard)); }
public PipeLine<From, String> toCardPostCode () { return pipe(new ORMAttributePipe<Me, String>(FIELD_CardPostCode)); } public PipeLine<From, String> toCardPostCode () { return pipe(new ORMAttributePipe<Me, String>(FIELD_CardPostCode)); }
...@@ -7051,6 +7642,8 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -7051,6 +7642,8 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
public PipeLine<From, Integer> toUsedCredits () { return pipe(new ORMAttributePipe<Me, Integer>(FIELD_UsedCredits)); } public PipeLine<From, Integer> toUsedCredits () { return pipe(new ORMAttributePipe<Me, Integer>(FIELD_UsedCredits)); }
public PipeLine<From, Integer> toAvailableCredits () { return pipe(new ORMAttributePipe<Me, Integer>(FIELD_AvailableCredits)); }
public PipeLine<From, Boolean> toIsPPJ () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsPPJ)); } public PipeLine<From, Boolean> toIsPPJ () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsPPJ)); }
public PipeLine<From, Boolean> toHasCap () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_HasCap)); } public PipeLine<From, Boolean> toHasCap () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_HasCap)); }
......
cmsWebApp/src/performa/orm/HiringTeam.java
...@@ -113,9 +113,23 @@ public class HiringTeam extends BaseHiringTeam ...@@ -113,9 +113,23 @@ public class HiringTeam extends BaseHiringTeam
public boolean hasValidCoupon() throws FieldException public boolean hasValidCoupon() throws FieldException
{ {
return hasValidCouponOn(DateDiff.getToday()); if(getCoupon() != null)
{
Coupon coupon = StripeUtils.retrieveCoupon(getCoupon().getCouponCode());
if(coupon.getValid() && (getCouponExpiryDate() == null || DateDiff.getToday().before(getCouponExpiryDate())))
{
return true;
}
}
setCoupon(null);
setCouponExpiryDate(null);
return false;
} }
public boolean hasValidCouponOn(Date date) throws FieldException public boolean hasValidCouponOn(Date date) throws FieldException
{ {
if(getCoupon() != null) if(getCoupon() != null)
...@@ -128,9 +142,6 @@ public class HiringTeam extends BaseHiringTeam ...@@ -128,9 +142,6 @@ public class HiringTeam extends BaseHiringTeam
} }
} }
setCoupon(null);
setCouponExpiryDate(null);
return false; return false;
} }
} }
\ No newline at end of file
cmsWebApp/src/performa/orm/HiringTeam.xml
...@@ -18,28 +18,31 @@ ...@@ -18,28 +18,31 @@
<TABLE name="tl_hiring_team" tablePrefix="object"> <TABLE name="tl_hiring_team" tablePrefix="object">
<ATTRIB name="HiringTeamName" type="String" dbcol="hiring_team_name" mandatory="true" length="100" /> <ATTRIB name="HiringTeamName" type="String" dbcol="hiring_team_name" mandatory="true" length="100" />
<ATTRIB name="HiringTeamLogo" type="BinaryContent" dbcol="hiring_team_logo" mandatory="false" binaryHandler="loggedin" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE" /> <ATTRIB name="HiringTeamLogo" type="BinaryContent" dbcol="hiring_team_logo" mandatory="false" binaryHandler="loggedin" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE" />
<ATTRIB name="HiringTeamType" type="HiringTeamType" dbcol="hiring_team_type" mandatory="false" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="HiringTeamType" type="HiringTeamType" dbcol="hiring_team_type" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="Industry" type="Industry" dbcol="industry" mandatory="false" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="Industry" type="Industry" dbcol="industry" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="TimeZone" type="TimeZone" dbcol="time_zone" mandatory="false" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="TimeZone" type="TimeZone" dbcol="time_zone" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="State" type="State" dbcol="state" mandatory="false" defaultValue="State.WA" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="State" type="State" dbcol="state" mandatory="false" defaultValue="State.WA" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="Country" type="Countries" dbcol="country" mandatory="false" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="Country" type="Countries" dbcol="country" mandatory="false" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="PostCode" type="String" dbcol="post_code" mandatory="false" length="10"/> <ATTRIB name="PostCode" type="String" dbcol="post_code" mandatory="false" length="10"/>
<ATTRIB name="City" type="String" dbcol="city" mandatory="false" length="100"/> <ATTRIB name="City" type="String" dbcol="city" mandatory="false" length="100"/>
<ATTRIB name="HasClientSupport" type="Boolean" dbcol="has_client_support" mandatory="false" defaultValue="Boolean.FALSE"/> <ATTRIB name="HasClientSupport" type="Boolean" dbcol="has_client_support" mandatory="false" defaultValue="Boolean.FALSE"/>
<ATTRIB name="ManageOwnBilling" type="Boolean" dbcol="manage_own_billing" mandatory="false" defaultValue="Boolean.TRUE"/> <ATTRIB name="ManageOwnBilling" type="Boolean" dbcol="manage_own_billing" mandatory="false" defaultValue="Boolean.TRUE"/>
<ATTRIB name="StripeReference" type="String" dbcol="stripe_reference" length="100" /> <ATTRIB name="StripeReference" type="String" dbcol="stripe_reference" length="100" />
<ATTRIB name="StripeSubscription" type="String" dbcol="stripe_subscription" length="100" /> <ATTRIB name="StripeSubscription" type="String" dbcol="stripe_subscription" length="100" />
<ATTRIB name="NameOnCard" type="String" dbcol="name_on_card" length="100" /> <ATTRIB name="StripeFixedSubItem" type="String" dbcol="stripe_fixed_sub_item" length="100" />
<ATTRIB name="CardPostCode" type="String" dbcol="card_post_code" length="10" /> <ATTRIB name="StripeMeteredSubItem" type="String" dbcol="stripe_metered_sub_item" length="100" />
<ATTRIB name="CardID" type="String" dbcol="card_id" length="100" /> <ATTRIB name="NameOnCard" type="String" dbcol="name_on_card" length="100" />
<ATTRIB name="PlanRenewedOn" type="Date" dbcol="plan_renewed_on" mandatory="false" /> <ATTRIB name="CardPostCode" type="String" dbcol="card_post_code" length="10" />
<ATTRIB name="UsedCredits" type="Integer" dbcol="used_credits" /> <ATTRIB name="CardID" type="String" dbcol="card_id" length="100" />
<ATTRIB name="IsPPJ" type="Boolean" dbcol="is_ppj" defaultValue="Boolean.TRUE"/> <ATTRIB name="PlanRenewedOn" type="Date" dbcol="plan_renewed_on" mandatory="false" />
<ATTRIB name="HasCap" type="Boolean" dbcol="has_cap" defaultValue="Boolean.FALSE"/> <ATTRIB name="UsedCredits" type="Integer" dbcol="used_credits" />
<ATTRIB name="MaxCap" type="Integer" dbcol="max_cap" /> <ATTRIB name="AvailableCredits" type="Integer" dbcol="available_credits" />
<ATTRIB name="CouponExpiryDate" type="Date" dbcol="coupon_expiry_date" /> <ATTRIB name="IsPPJ" type="Boolean" dbcol="is_ppj" defaultValue="Boolean.TRUE"/>
<ATTRIB name="HasCap" type="Boolean" dbcol="has_cap" defaultValue="Boolean.FALSE"/>
<ATTRIB name="MaxCap" type="Integer" dbcol="max_cap" />
<ATTRIB name="CouponExpiryDate" type="Date" dbcol="coupon_expiry_date" />
<SINGLEREFERENCE name="Company" type="Company" dbcol="company_id" mandatory="true" backreferenceName="HiringTeams" /> <SINGLEREFERENCE name="Company" type="Company" dbcol="company_id" mandatory="true" backreferenceName="HiringTeams" />
<SINGLEREFERENCE name="BillingTeam" type="HiringTeam" dbcol="billing_team_id" mandatory="false" /> <SINGLEREFERENCE name="BillingTeam" type="HiringTeam" dbcol="billing_team_id" mandatory="false" />
......
cmsWebApp/src/performa/orm/HiringTeamPersistenceMgr.java
...@@ -42,11 +42,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -42,11 +42,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
private Boolean dummyManageOwnBilling; private Boolean dummyManageOwnBilling;
private String dummyStripeReference; private String dummyStripeReference;
private String dummyStripeSubscription; private String dummyStripeSubscription;
private String dummyStripeFixedSubItem;
private String dummyStripeMeteredSubItem;
private String dummyNameOnCard; private String dummyNameOnCard;
private String dummyCardPostCode; private String dummyCardPostCode;
private String dummyCardID; private String dummyCardID;
private Date dummyPlanRenewedOn; private Date dummyPlanRenewedOn;
private Integer dummyUsedCredits; private Integer dummyUsedCredits;
private Integer dummyAvailableCredits;
private Boolean dummyIsPPJ; private Boolean dummyIsPPJ;
private Boolean dummyHasCap; private Boolean dummyHasCap;
private Integer dummyMaxCap; private Integer dummyMaxCap;
...@@ -67,11 +70,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -67,11 +70,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
private static final DefaultAttributeHelper HELPER_ManageOwnBilling = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_ManageOwnBilling = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_StripeReference = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_StripeReference = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_StripeSubscription = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_StripeSubscription = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_StripeFixedSubItem = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_StripeMeteredSubItem = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_NameOnCard = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_NameOnCard = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_CardPostCode = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_CardPostCode = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_CardID = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_CardID = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_PlanRenewedOn = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_PlanRenewedOn = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_UsedCredits = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_UsedCredits = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_AvailableCredits = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_HasCap = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_HasCap = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_MaxCap = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_MaxCap = DefaultAttributeHelper.INSTANCE;
...@@ -95,11 +101,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -95,11 +101,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
dummyManageOwnBilling = (Boolean)(HELPER_ManageOwnBilling.initialise (dummyManageOwnBilling)); dummyManageOwnBilling = (Boolean)(HELPER_ManageOwnBilling.initialise (dummyManageOwnBilling));
dummyStripeReference = (String)(HELPER_StripeReference.initialise (dummyStripeReference)); dummyStripeReference = (String)(HELPER_StripeReference.initialise (dummyStripeReference));
dummyStripeSubscription = (String)(HELPER_StripeSubscription.initialise (dummyStripeSubscription)); dummyStripeSubscription = (String)(HELPER_StripeSubscription.initialise (dummyStripeSubscription));
dummyStripeFixedSubItem = (String)(HELPER_StripeFixedSubItem.initialise (dummyStripeFixedSubItem));
dummyStripeMeteredSubItem = (String)(HELPER_StripeMeteredSubItem.initialise (dummyStripeMeteredSubItem));
dummyNameOnCard = (String)(HELPER_NameOnCard.initialise (dummyNameOnCard)); dummyNameOnCard = (String)(HELPER_NameOnCard.initialise (dummyNameOnCard));
dummyCardPostCode = (String)(HELPER_CardPostCode.initialise (dummyCardPostCode)); dummyCardPostCode = (String)(HELPER_CardPostCode.initialise (dummyCardPostCode));
dummyCardID = (String)(HELPER_CardID.initialise (dummyCardID)); dummyCardID = (String)(HELPER_CardID.initialise (dummyCardID));
dummyPlanRenewedOn = (Date)(HELPER_PlanRenewedOn.initialise (dummyPlanRenewedOn)); dummyPlanRenewedOn = (Date)(HELPER_PlanRenewedOn.initialise (dummyPlanRenewedOn));
dummyUsedCredits = (Integer)(HELPER_UsedCredits.initialise (dummyUsedCredits)); dummyUsedCredits = (Integer)(HELPER_UsedCredits.initialise (dummyUsedCredits));
dummyAvailableCredits = (Integer)(HELPER_AvailableCredits.initialise (dummyAvailableCredits));
dummyIsPPJ = (Boolean)(HELPER_IsPPJ.initialise (dummyIsPPJ)); dummyIsPPJ = (Boolean)(HELPER_IsPPJ.initialise (dummyIsPPJ));
dummyHasCap = (Boolean)(HELPER_HasCap.initialise (dummyHasCap)); dummyHasCap = (Boolean)(HELPER_HasCap.initialise (dummyHasCap));
dummyMaxCap = (Integer)(HELPER_MaxCap.initialise (dummyMaxCap)); dummyMaxCap = (Integer)(HELPER_MaxCap.initialise (dummyMaxCap));
...@@ -107,7 +116,7 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -107,7 +116,7 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}tl_hiring_team.object_id as id, {PREFIX}tl_hiring_team.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_hiring_team.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_hiring_team.hiring_team_name, {PREFIX}tl_hiring_team.hiring_team_logo, {PREFIX}tl_hiring_team.hiring_team_type, {PREFIX}tl_hiring_team.industry, {PREFIX}tl_hiring_team.time_zone, {PREFIX}tl_hiring_team.state, {PREFIX}tl_hiring_team.country, {PREFIX}tl_hiring_team.post_code, {PREFIX}tl_hiring_team.city, {PREFIX}tl_hiring_team.has_client_support, {PREFIX}tl_hiring_team.manage_own_billing, {PREFIX}tl_hiring_team.stripe_reference, {PREFIX}tl_hiring_team.stripe_subscription, {PREFIX}tl_hiring_team.name_on_card, {PREFIX}tl_hiring_team.card_post_code, {PREFIX}tl_hiring_team.card_id, {PREFIX}tl_hiring_team.plan_renewed_on, {PREFIX}tl_hiring_team.used_credits, {PREFIX}tl_hiring_team.is_ppj, {PREFIX}tl_hiring_team.has_cap, {PREFIX}tl_hiring_team.max_cap, {PREFIX}tl_hiring_team.coupon_expiry_date, {PREFIX}tl_hiring_team.company_id, {PREFIX}tl_hiring_team.billing_team_id, {PREFIX}tl_hiring_team.added_by_user_id, {PREFIX}tl_hiring_team.payment_plan_id, {PREFIX}tl_hiring_team.coupon_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_hiring_team.object_id as id, {PREFIX}tl_hiring_team.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_hiring_team.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_hiring_team.hiring_team_name, {PREFIX}tl_hiring_team.hiring_team_logo, {PREFIX}tl_hiring_team.hiring_team_type, {PREFIX}tl_hiring_team.industry, {PREFIX}tl_hiring_team.time_zone, {PREFIX}tl_hiring_team.state, {PREFIX}tl_hiring_team.country, {PREFIX}tl_hiring_team.post_code, {PREFIX}tl_hiring_team.city, {PREFIX}tl_hiring_team.has_client_support, {PREFIX}tl_hiring_team.manage_own_billing, {PREFIX}tl_hiring_team.stripe_reference, {PREFIX}tl_hiring_team.stripe_subscription, {PREFIX}tl_hiring_team.stripe_fixed_sub_item, {PREFIX}tl_hiring_team.stripe_metered_sub_item, {PREFIX}tl_hiring_team.name_on_card, {PREFIX}tl_hiring_team.card_post_code, {PREFIX}tl_hiring_team.card_id, {PREFIX}tl_hiring_team.plan_renewed_on, {PREFIX}tl_hiring_team.used_credits, {PREFIX}tl_hiring_team.available_credits, {PREFIX}tl_hiring_team.is_ppj, {PREFIX}tl_hiring_team.has_cap, {PREFIX}tl_hiring_team.max_cap, {PREFIX}tl_hiring_team.coupon_expiry_date, {PREFIX}tl_hiring_team.company_id, {PREFIX}tl_hiring_team.billing_team_id, {PREFIX}tl_hiring_team.added_by_user_id, {PREFIX}tl_hiring_team.payment_plan_id, {PREFIX}tl_hiring_team.coupon_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -171,11 +180,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -171,11 +180,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_ManageOwnBilling)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_ManageOwnBilling)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_StripeReference)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_StripeReference)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_StripeSubscription)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_StripeSubscription)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_StripeFixedSubItem)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_StripeMeteredSubItem)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_NameOnCard)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_NameOnCard)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_CardPostCode)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_CardPostCode)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_CardID)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_CardID)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_PlanRenewedOn)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_PlanRenewedOn)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_UsedCredits)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_UsedCredits)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_AvailableCredits)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_IsPPJ)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_IsPPJ)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_HasCap)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_HasCap)||
!tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_MaxCap)|| !tl_hiring_teamPSet.containsAttrib(HiringTeam.FIELD_MaxCap)||
...@@ -264,10 +276,10 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -264,10 +276,10 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}tl_hiring_team " + "UPDATE {PREFIX}tl_hiring_team " +
"SET hiring_team_name = ?, hiring_team_logo = ?, hiring_team_type = ?, industry = ?, time_zone = ?, state = ?, country = ?, post_code = ?, city = ?, has_client_support = ?, manage_own_billing = ?, stripe_reference = ?, stripe_subscription = ?, name_on_card = ?, card_post_code = ?, card_id = ?, plan_renewed_on = ?, used_credits = ?, is_ppj = ?, has_cap = ?, max_cap = ?, coupon_expiry_date = ?, company_id = ? , billing_team_id = ? , added_by_user_id = ? , payment_plan_id = ? , coupon_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET hiring_team_name = ?, hiring_team_logo = ?, hiring_team_type = ?, industry = ?, time_zone = ?, state = ?, country = ?, post_code = ?, city = ?, has_client_support = ?, manage_own_billing = ?, stripe_reference = ?, stripe_subscription = ?, stripe_fixed_sub_item = ?, stripe_metered_sub_item = ?, name_on_card = ?, card_post_code = ?, card_id = ?, plan_renewed_on = ?, used_credits = ?, available_credits = ?, is_ppj = ?, has_cap = ?, max_cap = ?, coupon_expiry_date = ?, company_id = ? , billing_team_id = ? , added_by_user_id = ? , payment_plan_id = ? , coupon_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE tl_hiring_team.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_hiring_team.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_HiringTeamName.getForSQL(dummyHiringTeamName, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamName))).listEntry (HELPER_HiringTeamLogo.getForSQL(dummyHiringTeamLogo, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamLogo))).listEntry (HELPER_HiringTeamType.getForSQL(dummyHiringTeamType, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamType))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_Industry))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_TimeZone))).listEntry (HELPER_State.getForSQL(dummyState, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_City))).listEntry (HELPER_HasClientSupport.getForSQL(dummyHasClientSupport, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HasClientSupport))).listEntry (HELPER_ManageOwnBilling.getForSQL(dummyManageOwnBilling, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_ManageOwnBilling))).listEntry (HELPER_StripeReference.getForSQL(dummyStripeReference, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeReference))).listEntry (HELPER_StripeSubscription.getForSQL(dummyStripeSubscription, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeSubscription))).listEntry (HELPER_NameOnCard.getForSQL(dummyNameOnCard, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_NameOnCard))).listEntry (HELPER_CardPostCode.getForSQL(dummyCardPostCode, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CardPostCode))).listEntry (HELPER_CardID.getForSQL(dummyCardID, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CardID))).listEntry (HELPER_PlanRenewedOn.getForSQL(dummyPlanRenewedOn, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_PlanRenewedOn))).listEntry (HELPER_UsedCredits.getForSQL(dummyUsedCredits, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_UsedCredits))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_IsPPJ))).listEntry (HELPER_HasCap.getForSQL(dummyHasCap, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HasCap))).listEntry (HELPER_MaxCap.getForSQL(dummyMaxCap, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_MaxCap))).listEntry (HELPER_CouponExpiryDate.getForSQL(dummyCouponExpiryDate, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CouponExpiryDate))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_Company)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_BillingTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_AddedByUser)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_PaymentPlan)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_Coupon)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_HiringTeamName.getForSQL(dummyHiringTeamName, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamName))).listEntry (HELPER_HiringTeamLogo.getForSQL(dummyHiringTeamLogo, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamLogo))).listEntry (HELPER_HiringTeamType.getForSQL(dummyHiringTeamType, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamType))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_Industry))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_TimeZone))).listEntry (HELPER_State.getForSQL(dummyState, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_City))).listEntry (HELPER_HasClientSupport.getForSQL(dummyHasClientSupport, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HasClientSupport))).listEntry (HELPER_ManageOwnBilling.getForSQL(dummyManageOwnBilling, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_ManageOwnBilling))).listEntry (HELPER_StripeReference.getForSQL(dummyStripeReference, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeReference))).listEntry (HELPER_StripeSubscription.getForSQL(dummyStripeSubscription, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeSubscription))).listEntry (HELPER_StripeFixedSubItem.getForSQL(dummyStripeFixedSubItem, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeFixedSubItem))).listEntry (HELPER_StripeMeteredSubItem.getForSQL(dummyStripeMeteredSubItem, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeMeteredSubItem))).listEntry (HELPER_NameOnCard.getForSQL(dummyNameOnCard, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_NameOnCard))).listEntry (HELPER_CardPostCode.getForSQL(dummyCardPostCode, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CardPostCode))).listEntry (HELPER_CardID.getForSQL(dummyCardID, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CardID))).listEntry (HELPER_PlanRenewedOn.getForSQL(dummyPlanRenewedOn, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_PlanRenewedOn))).listEntry (HELPER_UsedCredits.getForSQL(dummyUsedCredits, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_UsedCredits))).listEntry (HELPER_AvailableCredits.getForSQL(dummyAvailableCredits, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_AvailableCredits))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_IsPPJ))).listEntry (HELPER_HasCap.getForSQL(dummyHasCap, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HasCap))).listEntry (HELPER_MaxCap.getForSQL(dummyMaxCap, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_MaxCap))).listEntry (HELPER_CouponExpiryDate.getForSQL(dummyCouponExpiryDate, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CouponExpiryDate))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_Company)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_BillingTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_AddedByUser)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_PaymentPlan)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_Coupon)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -536,11 +548,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -536,11 +548,14 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_ManageOwnBilling, HELPER_ManageOwnBilling.getFromRS(dummyManageOwnBilling, r, "manage_own_billing")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_ManageOwnBilling, HELPER_ManageOwnBilling.getFromRS(dummyManageOwnBilling, r, "manage_own_billing"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_StripeReference, HELPER_StripeReference.getFromRS(dummyStripeReference, r, "stripe_reference")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_StripeReference, HELPER_StripeReference.getFromRS(dummyStripeReference, r, "stripe_reference"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_StripeSubscription, HELPER_StripeSubscription.getFromRS(dummyStripeSubscription, r, "stripe_subscription")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_StripeSubscription, HELPER_StripeSubscription.getFromRS(dummyStripeSubscription, r, "stripe_subscription"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_StripeFixedSubItem, HELPER_StripeFixedSubItem.getFromRS(dummyStripeFixedSubItem, r, "stripe_fixed_sub_item"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_StripeMeteredSubItem, HELPER_StripeMeteredSubItem.getFromRS(dummyStripeMeteredSubItem, r, "stripe_metered_sub_item"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_NameOnCard, HELPER_NameOnCard.getFromRS(dummyNameOnCard, r, "name_on_card")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_NameOnCard, HELPER_NameOnCard.getFromRS(dummyNameOnCard, r, "name_on_card"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_CardPostCode, HELPER_CardPostCode.getFromRS(dummyCardPostCode, r, "card_post_code")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_CardPostCode, HELPER_CardPostCode.getFromRS(dummyCardPostCode, r, "card_post_code"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_CardID, HELPER_CardID.getFromRS(dummyCardID, r, "card_id")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_CardID, HELPER_CardID.getFromRS(dummyCardID, r, "card_id"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_PlanRenewedOn, HELPER_PlanRenewedOn.getFromRS(dummyPlanRenewedOn, r, "plan_renewed_on")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_PlanRenewedOn, HELPER_PlanRenewedOn.getFromRS(dummyPlanRenewedOn, r, "plan_renewed_on"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_UsedCredits, HELPER_UsedCredits.getFromRS(dummyUsedCredits, r, "used_credits")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_UsedCredits, HELPER_UsedCredits.getFromRS(dummyUsedCredits, r, "used_credits"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_AvailableCredits, HELPER_AvailableCredits.getFromRS(dummyAvailableCredits, r, "available_credits"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_IsPPJ, HELPER_IsPPJ.getFromRS(dummyIsPPJ, r, "is_ppj")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_IsPPJ, HELPER_IsPPJ.getFromRS(dummyIsPPJ, r, "is_ppj"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_HasCap, HELPER_HasCap.getFromRS(dummyHasCap, r, "has_cap")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_HasCap, HELPER_HasCap.getFromRS(dummyHasCap, r, "has_cap"));
tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_MaxCap, HELPER_MaxCap.getFromRS(dummyMaxCap, r, "max_cap")); tl_hiring_teamPSet.setAttrib(HiringTeam.FIELD_MaxCap, HELPER_MaxCap.getFromRS(dummyMaxCap, r, "max_cap"));
...@@ -567,10 +582,10 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -567,10 +582,10 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}tl_hiring_team " + "INSERT INTO {PREFIX}tl_hiring_team " +
" (hiring_team_name, hiring_team_logo, hiring_team_type, industry, time_zone, state, country, post_code, city, has_client_support, manage_own_billing, stripe_reference, stripe_subscription, name_on_card, card_post_code, card_id, plan_renewed_on, used_credits, is_ppj, has_cap, max_cap, coupon_expiry_date, company_id, billing_team_id, added_by_user_id, payment_plan_id, coupon_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (hiring_team_name, hiring_team_logo, hiring_team_type, industry, time_zone, state, country, post_code, city, has_client_support, manage_own_billing, stripe_reference, stripe_subscription, stripe_fixed_sub_item, stripe_metered_sub_item, name_on_card, card_post_code, card_id, plan_renewed_on, used_credits, available_credits, is_ppj, has_cap, max_cap, coupon_expiry_date, company_id, billing_team_id, added_by_user_id, payment_plan_id, coupon_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_HiringTeamName.getForSQL(dummyHiringTeamName, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamName))).listEntry (HELPER_HiringTeamLogo.getForSQL(dummyHiringTeamLogo, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamLogo))).listEntry (HELPER_HiringTeamType.getForSQL(dummyHiringTeamType, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamType))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_Industry))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_TimeZone))).listEntry (HELPER_State.getForSQL(dummyState, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_City))).listEntry (HELPER_HasClientSupport.getForSQL(dummyHasClientSupport, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HasClientSupport))).listEntry (HELPER_ManageOwnBilling.getForSQL(dummyManageOwnBilling, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_ManageOwnBilling))).listEntry (HELPER_StripeReference.getForSQL(dummyStripeReference, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeReference))).listEntry (HELPER_StripeSubscription.getForSQL(dummyStripeSubscription, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeSubscription))).listEntry (HELPER_NameOnCard.getForSQL(dummyNameOnCard, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_NameOnCard))).listEntry (HELPER_CardPostCode.getForSQL(dummyCardPostCode, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CardPostCode))).listEntry (HELPER_CardID.getForSQL(dummyCardID, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CardID))).listEntry (HELPER_PlanRenewedOn.getForSQL(dummyPlanRenewedOn, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_PlanRenewedOn))).listEntry (HELPER_UsedCredits.getForSQL(dummyUsedCredits, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_UsedCredits))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_IsPPJ))).listEntry (HELPER_HasCap.getForSQL(dummyHasCap, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HasCap))).listEntry (HELPER_MaxCap.getForSQL(dummyMaxCap, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_MaxCap))).listEntry (HELPER_CouponExpiryDate.getForSQL(dummyCouponExpiryDate, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CouponExpiryDate))) .listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_Company)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_BillingTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_AddedByUser)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_PaymentPlan)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_Coupon)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_HiringTeamName.getForSQL(dummyHiringTeamName, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamName))).listEntry (HELPER_HiringTeamLogo.getForSQL(dummyHiringTeamLogo, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamLogo))).listEntry (HELPER_HiringTeamType.getForSQL(dummyHiringTeamType, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HiringTeamType))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_Industry))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_TimeZone))).listEntry (HELPER_State.getForSQL(dummyState, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_City))).listEntry (HELPER_HasClientSupport.getForSQL(dummyHasClientSupport, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HasClientSupport))).listEntry (HELPER_ManageOwnBilling.getForSQL(dummyManageOwnBilling, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_ManageOwnBilling))).listEntry (HELPER_StripeReference.getForSQL(dummyStripeReference, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeReference))).listEntry (HELPER_StripeSubscription.getForSQL(dummyStripeSubscription, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeSubscription))).listEntry (HELPER_StripeFixedSubItem.getForSQL(dummyStripeFixedSubItem, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeFixedSubItem))).listEntry (HELPER_StripeMeteredSubItem.getForSQL(dummyStripeMeteredSubItem, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_StripeMeteredSubItem))).listEntry (HELPER_NameOnCard.getForSQL(dummyNameOnCard, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_NameOnCard))).listEntry (HELPER_CardPostCode.getForSQL(dummyCardPostCode, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CardPostCode))).listEntry (HELPER_CardID.getForSQL(dummyCardID, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CardID))).listEntry (HELPER_PlanRenewedOn.getForSQL(dummyPlanRenewedOn, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_PlanRenewedOn))).listEntry (HELPER_UsedCredits.getForSQL(dummyUsedCredits, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_UsedCredits))).listEntry (HELPER_AvailableCredits.getForSQL(dummyAvailableCredits, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_AvailableCredits))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_IsPPJ))).listEntry (HELPER_HasCap.getForSQL(dummyHasCap, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_HasCap))).listEntry (HELPER_MaxCap.getForSQL(dummyMaxCap, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_MaxCap))).listEntry (HELPER_CouponExpiryDate.getForSQL(dummyCouponExpiryDate, tl_hiring_teamPSet.getAttrib (HiringTeam.FIELD_CouponExpiryDate))) .listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_Company)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_BillingTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_AddedByUser)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_PaymentPlan)))).listEntry (SQLManager.CheckNull((Long)(tl_hiring_teamPSet.getAttrib (HiringTeam.SINGLEREFERENCE_Coupon)))) .listEntry (objectID.longID ()).toList().toArray());
tl_hiring_teamPSet.setStatus (PersistentSetStatus.PROCESSED); tl_hiring_teamPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
......
cmsWebApp/src/performa/utils/StripeUtils.java
...@@ -3,6 +3,7 @@ package performa.utils; ...@@ -3,6 +3,7 @@ package performa.utils;
import com.stripe.Stripe; import com.stripe.Stripe;
import com.stripe.exception.StripeException; import com.stripe.exception.StripeException;
import com.stripe.model.Card; import com.stripe.model.Card;
import com.stripe.model.Charge;
import com.stripe.model.Coupon; import com.stripe.model.Coupon;
import com.stripe.model.Customer; import com.stripe.model.Customer;
import com.stripe.model.Event; import com.stripe.model.Event;
...@@ -27,11 +28,14 @@ import oneit.logging.LoggingArea; ...@@ -27,11 +28,14 @@ import oneit.logging.LoggingArea;
import oneit.objstore.ObjectTransaction; import oneit.objstore.ObjectTransaction;
import oneit.objstore.rdbms.filters.EqualsFilter; import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.security.SecUser; import oneit.security.SecUser;
import oneit.utils.BusinessException;
import oneit.utils.DateDiff; import oneit.utils.DateDiff;
import oneit.utils.math.NullArith;
import oneit.utils.parsers.FieldException; import oneit.utils.parsers.FieldException;
import performa.orm.Company; import performa.orm.Company;
import performa.orm.HiringTeam; import performa.orm.HiringTeam;
import performa.orm.PaymentPlan; import performa.orm.PaymentPlan;
import performa.orm.types.AssessmentType;
import spark.utils.IOUtils; import spark.utils.IOUtils;
...@@ -204,20 +208,15 @@ public class StripeUtils ...@@ -204,20 +208,15 @@ public class StripeUtils
} }
public static Subscription updatePlan(HiringTeam hiringTeam) throws FieldException public static Subscription updatePlan(HiringTeam hiringTeam, Subscription subscription, PaymentPlan paymentPlan) throws FieldException
{ {
try try
{ {
Subscription subscription = null;
PaymentPlan paymentPlan = hiringTeam.getPaymentPlan();
Map<String, Object> itemA = new HashMap<>(); Map<String, Object> itemA = new HashMap<>();
Map<String, Object> itemB = new HashMap<>(); Map<String, Object> itemB = new HashMap<>();
if(hiringTeam.getStripeSubscription() != null) if(subscription != null)
{ {
subscription = Subscription.retrieve(hiringTeam.getStripeSubscription());
itemA.put("id", subscription.getSubscriptionItems().getData().get(0).getId()); itemA.put("id", subscription.getSubscriptionItems().getData().get(0).getId());
itemB.put("id", subscription.getSubscriptionItems().getData().get(1).getId()); itemB.put("id", subscription.getSubscriptionItems().getData().get(1).getId());
} }
...@@ -252,6 +251,8 @@ public class StripeUtils ...@@ -252,6 +251,8 @@ public class StripeUtils
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Subscribing customer in stripe : ", subscription); LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Subscribing customer in stripe : ", subscription);
hiringTeam.setStripeSubscription(subscription.getId()); hiringTeam.setStripeSubscription(subscription.getId());
hiringTeam.setStripeFixedSubItem(subscription.getSubscriptionItems().getData().get(0).getId());
hiringTeam.setStripeMeteredSubItem(subscription.getSubscriptionItems().getData().get(1).getId());
return subscription; return subscription;
} }
...@@ -264,18 +265,40 @@ public class StripeUtils ...@@ -264,18 +265,40 @@ public class StripeUtils
} }
public static void chargeUpgradePlanDifference(HiringTeam hiringTeam, double costDifference) throws BusinessException
{
try
{
Map<String, Object> chargeParams = new HashMap<>();
chargeParams.put("amount", NullArith.intVal(NullArith.multiply(costDifference, 100, 0d)));
chargeParams.put("currency", "sgd");
chargeParams.put("description", "Charges of upgrading plan");
chargeParams.put("customer", hiringTeam.getStripeReference());
Charge.create(chargeParams);
}
catch (StripeException ex)
{
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, ex, "Error while charging plan upgrade difference in stripe");
throw new BusinessException("Problem with charging for your plan upgrade. Please contact adminstrator for more info.");
}
}
public static void recordUsage(HiringTeam hiringTeam) public static void recordUsage(HiringTeam hiringTeam)
{ {
try try
{ {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
Date now = new Date(); Date now = new Date();
String subscription = hiringTeam.getManageOwnBilling() ? hiringTeam.getStripeSubscription() : hiringTeam.getBillingTeam().getStripeSubscription(); HiringTeam billingTeam = hiringTeam.getManageOwnBilling() ? hiringTeam: hiringTeam.getBillingTeam();
params.put("quantity", 1); params.put("quantity", 1);
params.put("timestamp", now.getTime() / 1000L); params.put("timestamp", now.getTime() / 1000L);
params.put("subscription_item", subscription); params.put("subscription_item", billingTeam.getStripeMeteredSubItem());
params.put("action", "increment"); params.put("action", "increment");
UsageRecord.create(params, null); UsageRecord.create(params, null);
...@@ -305,24 +328,25 @@ public class StripeUtils ...@@ -305,24 +328,25 @@ public class StripeUtils
if(invoice.getBilling().equals("charge_automatically")) if(invoice.getBilling().equals("charge_automatically"))
{ {
Company[] companies = Company.SearchByAll().andStripeReference(new EqualsFilter<>(invoice.getCustomer())).search(objTran); HiringTeam[] hiringTeams = HiringTeam.SearchByAll().andStripeReference(new EqualsFilter<>(invoice.getCustomer())).search(objTran);
if(companies != null && companies.length > 0) if(hiringTeams != null && hiringTeams.length > 0)
{ {
Company company = companies[0]; HiringTeam hiringTeam = hiringTeams[0];
Date invoiceDate = new Date(invoice.getDate() * 1000L); Date invoiceDate = new Date(invoice.getDate() * 1000L);
if(company.getPlanRenewedOn() == null || !DateDiff.startOfDay(invoiceDate).equals(DateDiff.startOfDay(company.getPlanRenewedOn()))) if(hiringTeam.getPlanRenewedOn() == null || !DateDiff.startOfDay(invoiceDate).equals(DateDiff.startOfDay(hiringTeam.getPlanRenewedOn())))
{ {
if(company.getPlanRenewedOn() != null) if(hiringTeam.getPlanRenewedOn() != null)
{ {
company.setUsedCredits(0); hiringTeam.setUsedCredits(0);
hiringTeam.setAvailableCredits(hiringTeam.getPaymentPlan().getActiveJobCount());
} }
company.setPlanRenewedOn(invoiceDate); hiringTeam.setPlanRenewedOn(invoiceDate);
} }
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Setting company with reset plan details : ", company); LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Setting hiring team with reset plan details : ", hiringTeam);
} }
} }
} }
......
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
subscription = StripeUtils.retrieveSubscription(hiringTeam.getStripeSubscription()); subscription = StripeUtils.retrieveSubscription(hiringTeam.getStripeSubscription());
} }
System.out.println(subscription);
%> %>
<script type="text/javascript"> <script type="text/javascript">
var Popup = null; var Popup = null;
...@@ -78,7 +79,12 @@ ...@@ -78,7 +79,12 @@
$(".manage-plan-row input").on("change", function(){ $(".manage-plan-row input").on("change", function(){
setTabingSideBarHeight(); setTabingSideBarHeight();
}); });
}); });
function paymentPlanChanged()
{
$("#savePaymentPlan").click();
}
</script> </script>
<div class="container-fluid"> <div class="container-fluid">
...@@ -151,7 +157,7 @@ ...@@ -151,7 +157,7 @@
<div class="manage-plan-row"> <div class="manage-plan-row">
<div class="radio"> <div class="radio">
<label> <label>
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="IsPPJ" value="true"/> <oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="IsPPJ" value="true" onchange="paymentPlanChanged()"/>
</label> </label>
</div> </div>
<div class="manage-plan-title"> <div class="manage-plan-title">
...@@ -179,7 +185,7 @@ ...@@ -179,7 +185,7 @@
<div class="manage-plan-row"> <div class="manage-plan-row">
<div class="radio"> <div class="radio">
<label> <label>
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="IsPPJ" value="false"/> <oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="IsPPJ" value="false" onchange="paymentPlanChanged()"/>
</label> </label>
</div> </div>
<div class="manage-plan-title"> <div class="manage-plan-title">
...@@ -383,21 +389,19 @@ ...@@ -383,21 +389,19 @@
</div> </div>
</div> </div>
<div class="form-group row">
<oneit:button value="Update Subscription" name="saveCompany" cssClass="btn btn-primary largeBtn btn-green save-btn" style="display:inline;"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry ("Company", company)
.mapEntry ("IsPayment", Boolean.TRUE)
.mapEntry ("PaymentPlan", null)
.mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
.toMap() %>" />
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group row">
<oneit:button value=" " name="saveCompany" cssClass="btn btn-primary largeBtn btn-green save-btn" style="display:none;" id="savePaymentPlan"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry(NotificationUtils.DISPLAY_NOTIFICATION_PARAM, false)
.mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
.toMap() %>" />
</div>
<div class="text-center footer-note"> <div class="text-center footer-note">
Looking to cancel your account? Please <a href="http://www.talentology.com/">contact us.</a> Looking to cancel your account? Please <a href="http://www.talentology.com/">contact us.</a>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20181031_Alter_HiringTeam.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_hiring_team</tableName>
<column name="stripe_fixed_sub_item" type="String" nullable="true" length="100"/>
<column name="stripe_metered_sub_item" type="String" nullable="true" length="100"/>
<column name="available_credits" type="Long" nullable="true"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment