Skip to content

Commit b3cfbff

Browse files
swatijadhavswatijadhav
authored
Merge pull request #1014 from crossroads/master
[Release] v0.21.5
2 parents f6e6d65 + c61cae3 commit b3cfbff

File tree

6 files changed

+40
-25
lines changed

6 files changed

+40
-25
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,19 +327,19 @@ jobs:
327327
case "$CIRCLE_BRANCH" in
328328
master)
329329
echo 'export ENVIRONMENT=staging' >> $BASH_ENV
330-
echo 'export CERTIFICATE=GoodCity_2020_Development.p12' >> $BASH_ENV
330+
echo 'export CERTIFICATE=hk.goodcity.dev.p12' >> $BASH_ENV
331331
echo 'export PROVISIONING_PROFILE=GoodCityStockStaging.mobileprovision' >> $BASH_ENV
332332
echo 'export SCANDIT_LICENSE_KEY=$SCANDIT_LICENSE_KEY_IOS_STAGING' >> $BASH_ENV
333333
;;
334334
preview)
335335
echo 'export ENVIRONMENT=preview' >> $BASH_ENV
336-
echo 'export CERTIFICATE=GoodCity_2020_Development.p12' >> $BASH_ENV
336+
echo 'export CERTIFICATE=hk.goodcity.dev.p12' >> $BASH_ENV
337337
echo 'export PROVISIONING_PROFILE=GoodCityStockStaging.mobileprovision' >> $BASH_ENV
338338
echo 'export SCANDIT_LICENSE_KEY=$SCANDIT_LICENSE_KEY_IOS_STAGING' >> $BASH_ENV
339339
;;
340340
live)
341341
echo 'export ENVIRONMENT=production' >> $BASH_ENV
342-
echo 'export CERTIFICATE=Goodcity_2020.p12' >> $BASH_ENV
342+
echo 'export CERTIFICATE=hk.goodcity.p12' >> $BASH_ENV
343343
echo 'export PROVISIONING_PROFILE=GoodCityStock.mobileprovision' >> $BASH_ENV
344344
echo 'export SCANDIT_LICENSE_KEY=$SCANDIT_LICENSE_KEY_IOS' >> $BASH_ENV
345345
;;

‎Gemfile.lock‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ GEM
1515
artifactory (3.0.15)
1616
atomos (0.1.3)
1717
aws-eventstream (1.1.1)
18-
aws-partitions (1.435.0)
19-
aws-sdk-core (3.113.0)
18+
aws-partitions (1.446.0)
19+
aws-sdk-core (3.114.0)
2020
aws-eventstream (~> 1, >= 1.0.2)
2121
aws-partitions (~> 1, >= 1.239.0)
2222
aws-sigv4 (~> 1.1)
2323
jmespath (~> 1.0)
2424
aws-sdk-kms (1.43.0)
2525
aws-sdk-core (~> 3, >= 3.112.0)
2626
aws-sigv4 (~> 1.1)
27-
aws-sdk-s3 (1.93.0)
27+
aws-sdk-s3 (1.93.1)
2828
aws-sdk-core (~> 3, >= 3.112.0)
2929
aws-sdk-kms (~> 1)
3030
aws-sigv4 (~> 1.1)
@@ -77,27 +77,30 @@ GEM
7777
highline (~> 1.7.2)
7878
concurrent-ruby (1.1.5)
7979
declarative (0.0.20)
80-
declarative-option (0.1.0)
8180
digest-crc (0.6.3)
8281
rake (>= 12.0.0, < 14.0.0)
8382
domain_name (0.5.20190701)
8483
unf (>= 0.0.5, < 1.0.0)
8584
dotenv (2.7.6)
8685
emoji_regex (3.2.2)
8786
escape (0.0.4)
88-
excon (0.79.0)
89-
faraday (1.3.0)
87+
excon (0.80.1)
88+
faraday (1.4.1)
89+
faraday-excon (~> 1.1)
9090
faraday-net_http (~> 1.0)
91+
faraday-net_http_persistent (~> 1.1)
9192
multipart-post (>= 1.2, < 3)
92-
ruby2_keywords
93+
ruby2_keywords (>= 0.0.4)
9394
faraday-cookie_jar (0.0.7)
9495
faraday (>= 0.8.0)
9596
http-cookie (~> 1.0.0)
97+
faraday-excon (1.1.0)
9698
faraday-net_http (1.0.1)
99+
faraday-net_http_persistent (1.1.0)
97100
faraday_middleware (1.0.0)
98101
faraday (~> 1.0)
99102
fastimage (2.2.3)
100-
fastlane (2.179.0)
103+
fastlane (2.181.0)
101104
CFPropertyList (>= 2.3, < 4.0.0)
102105
addressable (>= 2.3, < 3.0.0)
103106
artifactory (~> 3.0)
@@ -156,7 +159,7 @@ GEM
156159
rexml
157160
signet (~> 0.14)
158161
webrick
159-
google-apis-iamcredentials_v1 (0.2.0)
162+
google-apis-iamcredentials_v1 (0.3.0)
160163
google-apis-core (~> 0.1)
161164
google-apis-storage_v1 (0.3.0)
162165
google-apis-core (~> 0.1)
@@ -174,7 +177,7 @@ GEM
174177
google-cloud-core (~> 1.2)
175178
googleauth (~> 0.9)
176179
mini_mime (~> 1.0)
177-
googleauth (0.16.0)
180+
googleauth (0.16.1)
178181
faraday (>= 0.17.3, < 2.0)
179182
jwt (>= 1.4, < 3.0)
180183
memoist (~> 0.16)
@@ -189,10 +192,10 @@ GEM
189192
concurrent-ruby (~> 1.0)
190193
jmespath (1.4.0)
191194
json (2.5.1)
192-
jwt (2.2.2)
195+
jwt (2.2.3)
193196
memoist (0.16.2)
194197
mini_magick (4.11.0)
195-
mini_mime (1.0.3)
198+
mini_mime (1.1.0)
196199
mini_portile2 (2.4.0)
197200
minitest (5.14.2)
198201
molinillo (0.6.6)
@@ -211,12 +214,12 @@ GEM
211214
plist (3.6.0)
212215
public_suffix (4.0.6)
213216
rake (13.0.3)
214-
representable (3.0.4)
217+
representable (3.1.1)
215218
declarative (< 0.1.0)
216-
declarative-option (< 0.2.0)
219+
trailblazer-option (>= 0.1.1, < 0.2.0)
217220
uber (< 0.2.0)
218221
retriable (3.1.2)
219-
rexml (3.2.4)
222+
rexml (3.2.5)
220223
rouge (2.0.7)
221224
ruby-macho (1.4.0)
222225
ruby2_keywords (0.0.4)
@@ -238,6 +241,7 @@ GEM
238241
terminal-table (1.8.0)
239242
unicode-display_width (~> 1.1, >= 1.1.1)
240243
thread_safe (0.3.6)
244+
trailblazer-option (0.1.1)
241245
tty-cursor (0.7.1)
242246
tty-screen (0.8.1)
243247
tty-spinner (0.9.3)

‎app/controllers/orders/detail.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ export default GoodcityController.extend(AsyncMixin, SearchMixin, {
266266
openSchedulePopup() {
267267
const scheduledAt = this.get("model.orderTransport.scheduledAt");
268268
try {
269-
const d = moment.tz(scheduledAt, this.get("hkTimeZone"));
270-
const timeString = d.format("hh:mmA");
269+
const scheduledDate = moment.tz(scheduledAt, this.get("hkTimeZone"));
270+
const timeString = scheduledDate.format("hh:mmA");
271271

272272
const currentTimeSlot = _.find(this.get("scheduleTimeSlots"), [
273273
"id",
@@ -279,8 +279,13 @@ export default GoodcityController.extend(AsyncMixin, SearchMixin, {
279279
currentTimeSlot || this.get("scheduleTimeSlots")[0]
280280
);
281281

282-
this.set("selectedScheduleDate", d.format());
283-
this.set("placeHolderDate", moment(d).format("ddd MMM do"));
282+
const formattedScheduledDate = moment(scheduledDate).format(
283+
"D MMMM, YYYY"
284+
);
285+
286+
this.set("selectedScheduleDate", scheduledDate.format());
287+
this.set("scheduledAtStringPlaceholder", formattedScheduledDate);
288+
this.set("placeHolderDate", formattedScheduledDate);
284289
} catch (e) {
285290
this.set("selectedTimeslot", this.get("scheduleTimeSlots")[0]);
286291
this.set("selectedScheduleDate", null);

‎app/controllers/orders/order_types.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default detail.extend({
4646
if (!date) {
4747
return this.get("i18n").t("order_details.logistics.pick_date");
4848
}
49-
return moment.tz(date, this.get("hkTimeZone")).format("ddd MMM D");
49+
return moment.tz(date, this.get("hkTimeZone")).format("D MMMM, YYYY");
5050
}
5151
),
5252

‎app/styles/templates/components/_package_summary_block.scss‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,13 @@
200200
font-size: 13.5px;
201201

202202
.description{
203-
color: #a3aab6
203+
display: -webkit-box;
204+
color: $light-text-color;
205+
line-height: 1.4;
206+
-webkit-line-clamp: 3;
207+
-webkit-box-orient: vertical;
208+
overflow: hidden;
209+
overflow-wrap: anywhere;
204210
}
205211
}
206212

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stock",
3-
"version": "0.21.4",
3+
"version": "0.21.5",
44
"private": true,
55
"directories": {
66
"doc": "doc",

0 commit comments

Comments
 (0)