diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 66218999dd53ef7f4e71a7c85b9dda868e13d886..def9eef0b1a8489380180e2cc3a968c1fcc8ed69 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -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="6533" /> + <entry key="py" value="6544" /> <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="6533" /> + <entry key="Python" value="6544" /> </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="125"> - <caret line="37" column="30" lean-forward="true" selection-start-line="37" selection-start-column="30" selection-end-line="37" selection-end-column="30" /> + <state relative-caret-position="1745"> + <caret line="117" lean-forward="true" selection-start-line="117" selection-end-line="117" /> </state> </provider> </entry> @@ -77,7 +78,7 @@ </provider> </entry> </file> - <file pinned="false" current-in-tab="true"> + <file pinned="false" current-in-tab="false"> <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="false"> + <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/cargo/views.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-12"> - <caret line="164" column="9" lean-forward="true" selection-start-line="164" selection-start-column="9" selection-end-line="164" selection-end-column="9" /> + <state relative-caret-position="366"> + <caret line="192" lean-forward="true" selection-start-line="192" selection-end-line="192" /> <folding> <element signature="e#2#47#0" expanded="true" /> - <marker date="1539230213513" expanded="true" signature="749:1415" ph="..." /> - <marker date="1539230213513" expanded="true" signature="3927:5129" ph="..." /> + <marker date="1539231449738" expanded="true" signature="749:1415" ph="..." /> + <marker date="1539231449738" 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="125"> - <caret line="37" column="30" lean-forward="true" selection-start-line="37" selection-start-column="30" selection-end-line="37" selection-end-column="30" /> + <state relative-caret-position="1745"> + <caret line="117" lean-forward="true" selection-start-line="117" 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="164" column="9" lean-forward="true" selection-start-line="164" selection-start-column="9" selection-end-line="164" selection-end-column="9" /> + <state relative-caret-position="366"> + <caret line="192" lean-forward="true" selection-start-line="192" selection-end-line="192" /> <folding> <element signature="e#2#47#0" expanded="true" /> - <marker date="1539230213513" expanded="true" signature="749:1415" ph="..." /> - <marker date="1539230213513" expanded="true" signature="3927:5129" ph="..." /> + <marker date="1539231449738" expanded="true" signature="749:1415" ph="..." /> + <marker date="1539231449738" 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 diff --git a/PMPBackend/settings.py b/PMPBackend/settings.py index ccd2c8158d5204199346d63bc326b44ba936e9fb..981fe4fec429896e0b969b65bb3437844dcc0358 100644 --- a/PMPBackend/settings.py +++ b/PMPBackend/settings.py @@ -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 diff --git a/cargo/views.py b/cargo/views.py index ea5c3b717e7731054e092497472832448e54b283..73fec26f8d3da76004bcf65f72e0d5e2d43c7b1f 100644 --- a/cargo/views.py +++ b/cargo/views.py @@ -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=useridNow) send_mail('You booking have been updated.',