Skip to content

Commit 331db07

Browse files
authored
Merge pull request #956 from crossroads/GCW-3422-Past-Shipments-show-wrong-date
GCW-3422-Remove minimum year restriction for shipments from calendar input component
2 parents 40696d7 + 6df6f86 commit 331db07

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

app/components/date-picker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ export default Ember.TextField.extend({
4343

4444
Ember.run.scheduleOnce("afterRender", this, function() {
4545
Ember.$(this.element).pickadate({
46-
selectMonths: !!enablePastDate,
47-
selectYears: !!enablePastDate,
46+
selectMonths: true,
47+
selectYears: true,
4848
formatSubmit: "ddd mmm d",
4949
monthsFull: moment.months(),
5050
monthsShort: moment.monthsShort(),

app/templates/orders/_international_orders_summary.hbs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,12 @@
5757
{{t "order.international.shipment_date"}}
5858
</div>
5959
<div class="small-8 columns">
60-
{{calendar-input
60+
{{date-picker
6161
name='order_selection_date'
6262
class="inline-edit-bg"
6363
id='shipmentDate'
64-
formatSubmit="dd mmmm yyyy"
65-
onSelect=(action "updateShipmentDate")
66-
enablePastDate=true
67-
selection=model.shipmentDate
64+
model=model.shipmentDate
65+
onSelect=(action 'updateShipmentDate')
6866
}}
6967
</div>
7068
</div>

0 commit comments

Comments
 (0)