浏览代码

fix return url

tags/1.1
0nepeop1e 4 年前
父节点
当前提交
ff8a6a1059
共有 3 个文件被更改,包括 49 次插入5 次删除
  1. 6
    0
      .idea/vcs.xml
  2. 41
    3
      .idea/workspace.xml
  3. 2
    2
      src/DummyPayDriver.php

+ 6
- 0
.idea/vcs.xml 查看文件

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
5
+  </component>
6
+</project>

+ 41
- 3
.idea/workspace.xml 查看文件

@@ -1,18 +1,42 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3
+  <component name="BranchesTreeState">
4
+    <expand>
5
+      <path>
6
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
7
+        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
8
+      </path>
9
+      <path>
10
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
11
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
12
+      </path>
13
+      <path>
14
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
15
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
16
+        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
17
+      </path>
18
+    </expand>
19
+    <select />
20
+  </component>
3 21
   <component name="ChangeListManager">
4
-    <list default="true" id="d34cafd0-eade-4b43-97b9-dd7f3a1eae86" name="Default Changelist" comment="" />
22
+    <list default="true" id="d34cafd0-eade-4b43-97b9-dd7f3a1eae86" name="Default Changelist" comment="">
23
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
24
+      <change beforePath="$PROJECT_DIR$/src/DummyPayDriver.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/DummyPayDriver.php" afterDir="false" />
25
+    </list>
5 26
     <option name="SHOW_DIALOG" value="false" />
6 27
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
7 28
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
8 29
     <option name="LAST_RESOLUTION" value="IGNORE" />
9 30
   </component>
10
-  <component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
31
+  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
11 32
     <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
12 33
     <execution>
13 34
       <executable path="composer" />
14 35
     </execution>
15 36
   </component>
37
+  <component name="Git.Settings">
38
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
39
+  </component>
16 40
   <component name="PhpWorkspaceProjectConfiguration">
17 41
     <include_path>
18 42
       <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
@@ -71,13 +95,27 @@
71 95
       <option name="number" value="Default" />
72 96
       <option name="presentableId" value="Default" />
73 97
       <updated>1600830685900</updated>
74
-      <workItem from="1600830687029" duration="3018000" />
98
+      <workItem from="1600830687029" duration="3217000" />
99
+      <workItem from="1600835177454" duration="172000" />
100
+      <workItem from="1600835569280" duration="44000" />
75 101
     </task>
76 102
     <servers />
77 103
   </component>
78 104
   <component name="TypeScriptGeneratedFilesManager">
79 105
     <option name="version" value="3" />
80 106
   </component>
107
+  <component name="Vcs.Log.Tabs.Properties">
108
+    <option name="TAB_STATES">
109
+      <map>
110
+        <entry key="MAIN">
111
+          <value>
112
+            <State />
113
+          </value>
114
+        </entry>
115
+      </map>
116
+    </option>
117
+    <option name="oldMeFiltersMigrated" value="true" />
118
+  </component>
81 119
   <component name="WindowStateProjectService">
82 120
     <state x="717" y="383" width="475" height="391" key="#Composer" timestamp="1600831395575">
83 121
       <screen x="0" y="32" width="1920" height="1048" />

+ 2
- 2
src/DummyPayDriver.php 查看文件

@@ -40,11 +40,11 @@ class DummyPayDriver implements PaymentGatewayDriver
40 40
 
41 41
     public function verifyGatewayCallback(Request $request, Response &$response = null): bool
42 42
     {
43
+        $order_id = $request->query->get('order_id');
43 44
         if($request->query->has('status')){
44
-            $response = Res::redirectTo($this->return_url);
45
+            $response = Res::redirectTo($this->return_url.'?'.http_build_query(['order_id' => $order_id, 'status' => 'success']));
45 46
             return $request->query->get('status') == 'success';
46 47
         } else {
47
-            $order_id = $request->query->get('order_id');
48 48
             /** @noinspection HtmlUnknownTarget */
49 49
             $html = sprintf(
50 50
                 '<a href="%s">Click Here for Positive Response</a><br/><br/><a href="%s">Click Here for Negative Response</a>',

正在加载...
取消
保存