Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
PMPBackend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lihuan Zhang
PMPBackend
Commits
dfc91a84
Commit
dfc91a84
authored
6 years ago
by
Lihuan Zhang
Browse files
Options
Downloads
Patches
Plain Diff
123
parent
a6bc7055
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.idea/workspace.xml
+32
-26
32 additions, 26 deletions
.idea/workspace.xml
PMPBackend/settings.py
+1
-1
1 addition, 1 deletion
PMPBackend/settings.py
cargo/views.py
+4
-3
4 additions, 3 deletions
cargo/views.py
with
37 additions
and
30 deletions
.idea/workspace.xml
+
32
−
26
View file @
dfc91a84
...
...
@@ -3,7 +3,8 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"8e0a1b72-f07e-4c5d-8e03-75ac89ac3031"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/../printing/.idea/vcs.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cargo/models.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cargo/models.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/PMPBackend/settings.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/PMPBackend/settings.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cargo/views.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cargo/views.py"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -29,7 +30,7 @@
<usages-collector
id=
"statistics.file.extensions.edit"
>
<counts>
<entry
key=
"html"
value=
"181"
/>
<entry
key=
"py"
value=
"65
33
"
/>
<entry
key=
"py"
value=
"65
44
"
/>
<entry
key=
"txt"
value=
"7"
/>
</counts>
</usages-collector>
...
...
@@ -37,7 +38,7 @@
<counts>
<entry
key=
"HTML"
value=
"181"
/>
<entry
key=
"PLAIN_TEXT"
value=
"7"
/>
<entry
key=
"Python"
value=
"65
33
"
/>
<entry
key=
"Python"
value=
"65
44
"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.extensions.open"
>
...
...
@@ -59,8 +60,8 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/PMPBackend/settings.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
2
5"
>
<caret
line=
"
37"
column=
"30
"
lean-forward=
"true"
selection-start-line=
"
3
7"
selection-
start-column=
"30"
selection-end-line=
"37"
selection-end-column=
"30
"
/>
<state
relative-caret-position=
"1
74
5"
>
<caret
line=
"
117
"
lean-forward=
"true"
selection-start-line=
"
11
7"
selection-
end-line=
"117
"
/>
</state>
</provider>
</entry>
...
...
@@ -77,7 +78,7 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/cargo/models.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"465"
>
...
...
@@ -86,15 +87,15 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/cargo/views.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-12
"
>
<caret
line=
"1
64"
column=
"
9"
lean-forward=
"true"
selection-start-line=
"1
64"
selection-start-column=
"9"
selection-end-line=
"164"
selection-end-column=
"9
"
/>
<state
relative-caret-position=
"
366
"
>
<caret
line=
"19
2
"
lean-forward=
"true"
selection-start-line=
"1
92"
selection-end-line=
"192
"
/>
<folding>
<element
signature=
"e#2#47#0"
expanded=
"true"
/>
<marker
date=
"153923
0213513
"
expanded=
"true"
signature=
"749:1415"
ph=
"..."
/>
<marker
date=
"153923
0213513
"
expanded=
"true"
signature=
"3927:5129"
ph=
"..."
/>
<marker
date=
"153923
1449738
"
expanded=
"true"
signature=
"749:1415"
ph=
"..."
/>
<marker
date=
"153923
1449738
"
expanded=
"true"
signature=
"3927:5129"
ph=
"..."
/>
</folding>
</state>
</provider>
...
...
@@ -166,6 +167,11 @@
</list>
</option>
</component>
<component
name=
"FindInProjectRecents"
>
<findStrings>
<find>
int
</find>
</findStrings>
</component>
<component
name=
"Git.Settings"
>
<option
name=
"RECENT_GIT_ROOT_PATH"
value=
"$PROJECT_DIR$"
/>
</component>
...
...
@@ -187,9 +193,9 @@
<option
value=
"$PROJECT_DIR$/PMPBackend/views.py"
/>
<option
value=
"$PROJECT_DIR$/PMPBackend/models.py"
/>
<option
value=
"$PROJECT_DIR$/PMPBackend/urls.py"
/>
<option
value=
"$PROJECT_DIR$/cargo/views.py"
/>
<option
value=
"$PROJECT_DIR$/PMPBackend/settings.py"
/>
<option
value=
"$PROJECT_DIR$/cargo/models.py"
/>
<option
value=
"$PROJECT_DIR$/PMPBackend/settings.py"
/>
<option
value=
"$PROJECT_DIR$/cargo/views.py"
/>
</list>
</option>
</component>
...
...
@@ -467,31 +473,31 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/cargo/models.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"465"
>
<caret
line=
"31"
column=
"44"
lean-forward=
"true"
selection-start-line=
"31"
selection-start-column=
"44"
selection-end-line=
"31"
selection-end-column=
"44"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/PMPBackend/settings.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
2
5"
>
<caret
line=
"
37"
column=
"30
"
lean-forward=
"true"
selection-start-line=
"
3
7"
selection-
start-column=
"30"
selection-end-line=
"37"
selection-end-column=
"30
"
/>
<state
relative-caret-position=
"1
74
5"
>
<caret
line=
"
117
"
lean-forward=
"true"
selection-start-line=
"
11
7"
selection-
end-line=
"117
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/cargo/views.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-12
"
>
<caret
line=
"1
64"
column=
"
9"
lean-forward=
"true"
selection-start-line=
"1
64"
selection-start-column=
"9"
selection-end-line=
"164"
selection-end-column=
"9
"
/>
<state
relative-caret-position=
"
366
"
>
<caret
line=
"19
2
"
lean-forward=
"true"
selection-start-line=
"1
92"
selection-end-line=
"192
"
/>
<folding>
<element
signature=
"e#2#47#0"
expanded=
"true"
/>
<marker
date=
"153923
0213513
"
expanded=
"true"
signature=
"749:1415"
ph=
"..."
/>
<marker
date=
"153923
0213513
"
expanded=
"true"
signature=
"3927:5129"
ph=
"..."
/>
<marker
date=
"153923
1449738
"
expanded=
"true"
signature=
"749:1415"
ph=
"..."
/>
<marker
date=
"153923
1449738
"
expanded=
"true"
signature=
"3927:5129"
ph=
"..."
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/cargo/models.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"465"
>
<caret
line=
"31"
column=
"44"
lean-forward=
"true"
selection-start-line=
"31"
selection-start-column=
"44"
selection-end-line=
"31"
selection-end-column=
"44"
/>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
PMPBackend/settings.py
+
1
−
1
View file @
dfc91a84
...
...
@@ -129,7 +129,7 @@ STATIC_URL = '/static/'
# Email
EMAIL_USE_SSL
=
True
EMAIL_HOST
=
'
smtp.gmail.com
'
# 如果是 163 改成 smtp.163.com
EMAIL_PORT
=
587
EMAIL_PORT
=
465
EMAIL_HOST_USER
=
'
susantoonlinecargo@gmail.com
'
# 帐号
EMAIL_HOST_PASSWORD
=
'
G27HLFeb8dIx
'
# 密码
DEFAULT_FROM_EMAIL
=
EMAIL_HOST_USER
This diff is collapsed.
Click to expand it.
cargo/views.py
+
4
−
3
View file @
dfc91a84
...
...
@@ -195,14 +195,15 @@ def updatebook(request):
bookCur
=
requestbook
.
objects
.
get
(
bookID
=
bookidNow
)
bookCur
.
HBL
=
req
.
get
(
'
bookingHBL
'
)
print
(
bookCur
.
HBL
,
file
=
sys
.
stderr
)
#
print(bookCur.HBL, file=sys.stderr)
bookCur
.
status
=
req
.
get
(
'
bookingStatus
'
,
bookCur
.
status
)
bookCur
.
pickupDate
=
req
.
get
(
'
bookingPickupDate
'
,
bookCur
.
pickupDate
)
bookCur
.
shiperMessage
=
req
.
get
(
'
bookingInformationShipper
'
,
bookCur
.
shiperMessage
)
userid
=
bookCur
.
userID
useridNow
=
bookCur
.
userID_id
bookCur
.
save
()
userNow
=
user
.
objects
.
get
(
userID
=
userid
)
userNow
=
user
.
objects
.
get
(
userID
=
userid
Now
)
send_mail
(
'
You booking have been updated.
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment