Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
DrinkRun
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Justin Fowler
DrinkRun
Commits
76016f22
Commit
76016f22
authored
Jun 16, 2020
by
Bryan Tong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixIssues' into 'master'
Upgrades to fix known issues. See merge request
nullivex/drinkrun!1
parents
297a101f
fd4b72b2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
lib/Drink.js
lib/Drink.js
+2
-1
package-lock.json
package-lock.json
+2
-2
package.json
package.json
+1
-1
No files found.
lib/Drink.js
View file @
76016f22
...
...
@@ -69,7 +69,8 @@ class Drink extends Module {
if
(
fs
.
exists
(
Drink
.
storePath
()))
{
throw
new
Error
(
'
Agent is currently shopping
'
)
}
const
fields
=
[
'
name
'
,
'
customer
'
,
'
cost
'
,
'
tip
'
]
const
fields
=
[
'
name
'
,
'
customer
'
,
'
cost
'
,
'
tip
'
,
'
quantityFilled
'
]
data
.
quantityFilled
=
0
const
rv
=
await
DrinkModel
.
save
(
DrinkModel
,
this
.
db
,
0
,
fields
,
data
)
res
.
render
(
'
requestSuccess
'
,
{
drinkId
:
rv
})
}
catch
(
e
)
{
...
...
package-lock.json
View file @
76016f22
...
...
@@ -28,8 +28,8 @@
}
},
"kado"
:
{
"version"
:
"git+https://git.nullivex.com/
kado/kado.git#68c1d3d6bdb38bc10adb15775213377717abbe8b
"
,
"from"
:
"git+https://git.nullivex.com/
kado/kado.git
"
"version"
:
"git+https://git.nullivex.com/
nullivex/kado.git#5431ce27016ef686fe98ba0bd9fd388d1ebb1a20
"
,
"from"
:
"git+https://git.nullivex.com/
nullivex/kado.git#handleQueryDates
"
},
"long"
:
{
"version"
:
"4.0.0"
,
...
...
package.json
View file @
76016f22
...
...
@@ -4,7 +4,7 @@
"description"
:
""
,
"main"
:
"app.js"
,
"dependencies"
:
{
"kado"
:
"git+https://git.nullivex.com/
kado/kado.git
"
,
"kado"
:
"git+https://git.nullivex.com/
nullivex/kado.git#handleQueryDates
"
,
"
mariadb
"
:
"
^2.4.0
"
},
"devDependencies"
:
{},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment