From 4f2a7ab1200c24043e4353e76afb314ee3964902 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Mon, 18 Feb 2019 11:33:36 +0800
Subject: [PATCH 1/6] fix issue 1 about the default for duration date

---
 src/trade/tradeDialog.es6 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/trade/tradeDialog.es6 b/src/trade/tradeDialog.es6
index 8104bec3df..c7ec12954a 100644
--- a/src/trade/tradeDialog.es6
+++ b/src/trade/tradeDialog.es6
@@ -586,6 +586,9 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
           .then(function(times){
             const value_hour = times.close !== '--' ? times.close : '23:59:59';
             state.date_expiry.value_hour = moment.utc(value_hour, 'HH:mm:ss').format('HH:mm');
+            if (state.duration.value === 'Duration') {
+              state.date_expiry.value_date = moment.utc().format('YYYY-MM-DD');
+            }
             state.date_expiry.value = moment.utc(state.date_expiry.value_date + ' ' + value_hour).unix();
             state.barriers.update();
             debounce(state.date_expiry.value, state.proposal.onchange);

From a4e166aa00b7ce2398c4b59154d551fed2dd867e Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Mon, 18 Feb 2019 18:31:33 +0800
Subject: [PATCH 2/6] add rivets binder to edit mindatepicker

---
 src/common/rivetsExtra.es6 |  4 ++++
 src/trade/tradeDialog.es6  | 15 +++++++++++++++
 src/trade/tradeDialog.html |  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/common/rivetsExtra.es6 b/src/common/rivetsExtra.es6
index 479b8b6134..407abeb54b 100644
--- a/src/common/rivetsExtra.es6
+++ b/src/common/rivetsExtra.es6
@@ -432,6 +432,10 @@ rv.binders.slider = {
    }
 }
 
+rv.binders.mindatepicker = {
+   routine: (el, value) => $(el).datepicker('option', 'minDate', value)
+}
+
 /* trun input element in jquery-ui-datepicker */
 rv.binders.datepicker = {
    priority: 94,
diff --git a/src/trade/tradeDialog.es6 b/src/trade/tradeDialog.es6
index c7ec12954a..1a97ca0e64 100644
--- a/src/trade/tradeDialog.es6
+++ b/src/trade/tradeDialog.es6
@@ -286,6 +286,7 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
       value_hour: moment.utc().format('HH:mm'), /* now utc in hh:mm format */
       value: 0,    /* epoch value of date+hour */
       today_times: { open: '--', close: '--', disabled: false }, /* trading times for today */
+      min_date: 0,
       onHourShow: function(hour) { /* for timepicker */
         return validateHour({
           hour,
@@ -580,10 +581,16 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
     /* contracts that are more not today must end at the market close time */
     const { value_date } = state.date_expiry;
     const is_today = !moment.utc(value_date).isAfter(moment.utc(), 'day');
+
     if (!is_today) {
       state.date_expiry.today_times.disabled = true;
         trading_times_for(value_date, state.proposal.symbol)
           .then(function(times){
+            if (state.duration_unit.array[0] && !hasIntradayUnit(state.duration_unit.array)) {
+              state.date_expiry.min_date = 1;
+            } else {
+              state.date_expiry.min_date = 0;
+            }
             const value_hour = times.close !== '--' ? times.close : '23:59:59';
             state.date_expiry.value_hour = moment.utc(value_hour, 'HH:mm:ss').format('HH:mm');
             if (state.duration.value === 'Duration') {
@@ -596,6 +603,10 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
     }
     else {
         if (date_or_hour !== state.date_expiry.value_hour) { state.date_expiry.update_times(); }
+        if (state.duration_unit.array[0] && !hasIntradayUnit(state.duration_unit.array)) {
+          state.date_expiry.min_date = 1;
+          state.date_expiry.value_date = moment.utc().add(1, 'days').format('YYYY-MM-DD');
+        }
         state.date_expiry.value = moment.utc(state.date_expiry.value_date + ' ' + state.date_expiry.value_hour).unix();
         state.barriers.update();
         debounce(state.date_expiry.value, state.proposal.onchange);
@@ -916,6 +927,10 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
     return barrier && (barrier.startsWith('+') || barrier.startsWith('-')) ? true : false;
   }
 
+  function hasIntradayUnit(duration_unit_array) {
+    return duration_unit_array.some(unit => ['minutes', 'hours'].indexOf(unit) !== -1)
+  }
+
   state.purchase.onclick = async function() {
     const categories_with_tick_chart = ['digits', 'callput', 'callputequal', 'asian', 'touchnotouch'];
     state.purchase.loading = true;
diff --git a/src/trade/tradeDialog.html b/src/trade/tradeDialog.html
index ddf03eebd9..1e403cd943 100644
--- a/src/trade/tradeDialog.html
+++ b/src/trade/tradeDialog.html
@@ -24,7 +24,7 @@
     </ul>
 
     <ul class="contract-displays fill-bg-color"
-        rv-data="category_displays.selected | notify date_start.update duration_unit.update basis.update_limit digits.update | debounce proposal.onchange">
+        rv-data="category_displays.selected | notify date_start.update duration_unit.update basis.update_limit digits.update date_expiry.update | debounce proposal.onchange">
         <li rv-each-row="category_displays.array"
             rv-on-click="category_displays.onclick"
             rv-data-name="row.name"
@@ -100,6 +100,7 @@
         <li rv-show="duration.value | eq 'End Time' ">
             <input type="text" class="date-expiry-date" readonly
                    numberOfMonths="1" marginTop="0px" marginLeft="-100px"
+                   rv-mindatepicker="date_expiry.min_date"
                    rv-datepicker="date_expiry.value_date | notify date_expiry.update" />
         </li>
         <li rv-if="duration.value | eq 'End Time' ">

From 909cf71dd38c9d01a4b131ce7a85da1e9aaabd22 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Tue, 19 Feb 2019 10:01:31 +0800
Subject: [PATCH 3/6] refactor logic statement

---
 src/trade/tradeDialog.es6  | 9 +++------
 src/trade/tradeDialog.html | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/trade/tradeDialog.es6 b/src/trade/tradeDialog.es6
index 1a97ca0e64..923a120873 100644
--- a/src/trade/tradeDialog.es6
+++ b/src/trade/tradeDialog.es6
@@ -581,16 +581,13 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
     /* contracts that are more not today must end at the market close time */
     const { value_date } = state.date_expiry;
     const is_today = !moment.utc(value_date).isAfter(moment.utc(), 'day');
+    const is_daily_contracts = state.duration_unit.array[0] && !hasIntradayUnit(state.duration_unit.array);
 
     if (!is_today) {
       state.date_expiry.today_times.disabled = true;
         trading_times_for(value_date, state.proposal.symbol)
           .then(function(times){
-            if (state.duration_unit.array[0] && !hasIntradayUnit(state.duration_unit.array)) {
-              state.date_expiry.min_date = 1;
-            } else {
-              state.date_expiry.min_date = 0;
-            }
+            state.date_expiry.min_date = is_daily_contracts ? 1 : 0;
             const value_hour = times.close !== '--' ? times.close : '23:59:59';
             state.date_expiry.value_hour = moment.utc(value_hour, 'HH:mm:ss').format('HH:mm');
             if (state.duration.value === 'Duration') {
@@ -603,7 +600,7 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
     }
     else {
         if (date_or_hour !== state.date_expiry.value_hour) { state.date_expiry.update_times(); }
-        if (state.duration_unit.array[0] && !hasIntradayUnit(state.duration_unit.array)) {
+        if (is_daily_contracts) {
           state.date_expiry.min_date = 1;
           state.date_expiry.value_date = moment.utc().add(1, 'days').format('YYYY-MM-DD');
         }
diff --git a/src/trade/tradeDialog.html b/src/trade/tradeDialog.html
index 1e403cd943..a3baea54e5 100644
--- a/src/trade/tradeDialog.html
+++ b/src/trade/tradeDialog.html
@@ -24,7 +24,7 @@
     </ul>
 
     <ul class="contract-displays fill-bg-color"
-        rv-data="category_displays.selected | notify date_start.update duration_unit.update basis.update_limit digits.update date_expiry.update | debounce proposal.onchange">
+        rv-data="category_displays.selected | notify date_start.update duration_unit.update basis.update_limit digits.update | debounce proposal.onchange">
         <li rv-each-row="category_displays.array"
             rv-on-click="category_displays.onclick"
             rv-data-name="row.name"

From 17c31e7199d28ef403d0120100a37e151146455f Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Tue, 19 Feb 2019 13:30:51 +0800
Subject: [PATCH 4/6] fix naming rivets extra

---
 src/common/rivetsExtra.es6 | 2 +-
 src/trade/tradeDialog.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/rivetsExtra.es6 b/src/common/rivetsExtra.es6
index 407abeb54b..03606fe57d 100644
--- a/src/common/rivetsExtra.es6
+++ b/src/common/rivetsExtra.es6
@@ -432,7 +432,7 @@ rv.binders.slider = {
    }
 }
 
-rv.binders.mindatepicker = {
+rv.binders.datepicker_mindate = {
    routine: (el, value) => $(el).datepicker('option', 'minDate', value)
 }
 
diff --git a/src/trade/tradeDialog.html b/src/trade/tradeDialog.html
index a3baea54e5..bde19edfea 100644
--- a/src/trade/tradeDialog.html
+++ b/src/trade/tradeDialog.html
@@ -100,7 +100,7 @@
         <li rv-show="duration.value | eq 'End Time' ">
             <input type="text" class="date-expiry-date" readonly
                    numberOfMonths="1" marginTop="0px" marginLeft="-100px"
-                   rv-mindatepicker="date_expiry.min_date"
+                   rv-datepicker_mindate="date_expiry.min_date"
                    rv-datepicker="date_expiry.value_date | notify date_expiry.update" />
         </li>
         <li rv-if="duration.value | eq 'End Time' ">

From deb5f7117b7bf089006c358c90d8f66c43e3f0a2 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Tue, 19 Feb 2019 14:42:06 +0800
Subject: [PATCH 5/6] reposition hasintradayunit function

---
 src/trade/tradeDialog.es6 | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/trade/tradeDialog.es6 b/src/trade/tradeDialog.es6
index 923a120873..f75e57fb4d 100644
--- a/src/trade/tradeDialog.es6
+++ b/src/trade/tradeDialog.es6
@@ -243,6 +243,10 @@ function validateMinute({ hour, minute, today_times, selected_date_unix }) {
   return (hour > open_hour && hour < close_hour) || hour < close_hour || hour > open_hour;
 }
 
+function hasIntradayUnit(duration_unit_array) {
+  return duration_unit_array.some(unit => ['minutes', 'hours'].indexOf(unit) !== -1);
+}
+
 function init_state(available,root, dialog, symbol, contracts_for_spot) {
   var state = {
     duration: {
@@ -587,14 +591,16 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
       state.date_expiry.today_times.disabled = true;
         trading_times_for(value_date, state.proposal.symbol)
           .then(function(times){
-            state.date_expiry.min_date = is_daily_contracts ? 1 : 0;
-            const value_hour = times.close !== '--' ? times.close : '23:59:59';
-            state.date_expiry.value_hour = moment.utc(value_hour, 'HH:mm:ss').format('HH:mm');
             if (state.duration.value === 'Duration') {
               state.date_expiry.value_date = moment.utc().format('YYYY-MM-DD');
             }
+
+            const value_hour = times.close !== '--' ? times.close : '23:59:59';
+            state.date_expiry.min_date = is_daily_contracts ? 1 : 0;
+            state.date_expiry.value_hour = moment.utc(value_hour, 'HH:mm:ss').format('HH:mm');
             state.date_expiry.value = moment.utc(state.date_expiry.value_date + ' ' + value_hour).unix();
             state.barriers.update();
+
             debounce(state.date_expiry.value, state.proposal.onchange);
           });
     }
@@ -924,9 +930,7 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
     return barrier && (barrier.startsWith('+') || barrier.startsWith('-')) ? true : false;
   }
 
-  function hasIntradayUnit(duration_unit_array) {
-    return duration_unit_array.some(unit => ['minutes', 'hours'].indexOf(unit) !== -1)
-  }
+
 
   state.purchase.onclick = async function() {
     const categories_with_tick_chart = ['digits', 'callput', 'callputequal', 'asian', 'touchnotouch'];

From d25c59fb2a5c423633f6c3ed1d0dabdaa5bd6eb2 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Tue, 19 Feb 2019 14:50:28 +0800
Subject: [PATCH 6/6] remove extra blank lines

---
 src/trade/tradeDialog.es6 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/trade/tradeDialog.es6 b/src/trade/tradeDialog.es6
index f75e57fb4d..58a0a32c03 100644
--- a/src/trade/tradeDialog.es6
+++ b/src/trade/tradeDialog.es6
@@ -930,8 +930,6 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
     return barrier && (barrier.startsWith('+') || barrier.startsWith('-')) ? true : false;
   }
 
-
-
   state.purchase.onclick = async function() {
     const categories_with_tick_chart = ['digits', 'callput', 'callputequal', 'asian', 'touchnotouch'];
     state.purchase.loading = true;