Commit d28f0563 authored by Shani's avatar Shani

Merge branch 'BRCD-1634-discount_proration' into 'discount_proration'

BRCD-1634 Front End for service quantity based discounts

See merge request !967
parents dea0eb66 376777ae
......@@ -277,6 +277,18 @@ fieldset[disabled] .btn {
.custom-field-input .Field {
display: inline-block;
}
.Field.label-input input {
padding: 0 5px;
height: 18px;
width: 35px;
text-align: center;
}
.input-group-addon .action-button button {
padding: 0;
}
.custom-field-input .form-control{
margin: 0 0 7px 0;
padding: 3px 4px;
......
......@@ -286,24 +286,24 @@ export default class DiscountDetails extends Component {
</FormGroup>
</Panel>
<FormGroup>
<Col componentClass={ControlLabel} sm={3} lg={2}>Prorated?</Col>
<Col sm={8} lg={9} style={{ paddingTop: 7 }}>
<Field
value={proratedValue}
onChange={this.onChangeProrated}
fieldType="checkbox"
editable={editable}
/>
</Col>
</FormGroup>
<EntityFields
entityName="discounts"
entity={discount}
onChangeField={this.onChangeAdditionalField}
editable={editable}
/>
<FormGroup>
<Col componentClass={ControlLabel} sm={3} lg={2}>Prorated?</Col>
<Col sm={8} lg={9} style={{ paddingTop: 7 }}>
<Field
value={proratedValue}
onChange={this.onChangeProrated}
fieldType="checkbox"
editable={editable}
/>
</Col>
</FormGroup>
<EntityFields
entityName="discounts"
entity={discount}
onChangeField={this.onChangeAdditionalField}
editable={editable}
/>
<Panel header={<h3>Discount Conditions</h3>}>
<FormGroup>
......
......@@ -29,6 +29,7 @@ const Action = (props) => {
'fa-refresh': type === 'refresh',
'fa-arrow-left': type === 'back',
'fa-minus': type === 'collapse',
'fa-cog': type === 'settings',
});
const onClick = () => {
......
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