Changeset 2109215
- Timestamp:
- 06/20/2019 03:59:59 AM (7 years ago)
- Location:
- segment-for-wp-by-in8-io
- Files:
-
- 5 edited
-
.idea/workspace.xml (modified) (20 diffs)
-
trunk/README.txt (modified) (1 diff)
-
trunk/includes/class-segment-for-wordpress-track.php (modified) (2 diffs)
-
trunk/includes/class-segment-for-wordpress.php (modified) (6 diffs)
-
trunk/segment-for-wordpress.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
segment-for-wp-by-in8-io/.idea/workspace.xml
r2109173 r2109215 5 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 6 6 <change beforePath="$PROJECT_DIR$/trunk/README.txt" beforeDir="false" afterPath="$PROJECT_DIR$/trunk/README.txt" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-identify.php" beforeDir="false" afterPath="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-identify.php" afterDir="false" />8 7 <change beforePath="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-track.php" beforeDir="false" afterPath="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-track.php" afterDir="false" /> 9 8 <change beforePath="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress.php" beforeDir="false" afterPath="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress.php" afterDir="false" /> … … 29 28 <caret line="20" column="3" lean-forward="true" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" /> 30 29 <folding> 31 <element signature="e#7#74 0#0#PHP" expanded="true" />30 <element signature="e#7#741#0#PHP" expanded="true" /> 32 31 </folding> 33 32 </state> … … 38 37 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-http-track.php"> 39 38 <provider selected="true" editor-type-id="text-editor"> 40 <state relative-caret-position=" -743">39 <state relative-caret-position="45"> 41 40 <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" /> 42 41 </state> … … 44 43 </entry> 45 44 </file> 46 <file pinned="false" current-in-tab=" true">45 <file pinned="false" current-in-tab="false"> 47 46 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-identify.php"> 48 47 <provider selected="true" editor-type-id="text-editor"> 49 <state relative-caret-position=" 423">50 <caret line=" 39" column="47" lean-forward="true" selection-start-line="39" selection-start-column="47" selection-end-line="39" selection-end-column="47" />48 <state relative-caret-position="279"> 49 <caret line="99" column="38" selection-end-line="171" selection-end-column="61" /> 51 50 <folding> 52 <element signature="n#add_user_traits#0;n#!!top" />53 51 <element signature="e#1873#1941#0#PHP" /> 54 <element signature="e#1943#6440#0#PHP" />55 52 </folding> 56 53 </state> … … 61 58 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-track.php"> 62 59 <provider selected="true" editor-type-id="text-editor"> 63 <state relative-caret-position=" 469">64 <caret line=" 74" selection-start-line="74" selection-end-line="76" selection-end-column="44" />60 <state relative-caret-position="315"> 61 <caret line="21" column="34" lean-forward="true" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="34" /> 65 62 </state> 66 63 </provider> … … 70 67 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress.php"> 71 68 <provider selected="true" editor-type-id="text-editor"> 72 <state relative-caret-position=" 180">73 <caret line=" 722" column="70" selection-start-line="722" selection-start-column="70" selection-end-line="722" selection-end-column="70" />69 <state relative-caret-position="22365"> 70 <caret line="2118" lean-forward="true" selection-start-line="2118" selection-end-line="2118" /> 74 71 <folding> 75 72 <element signature="e#7#340#0#PHP" expanded="true" /> 76 73 <element signature="n#load_dependencies#0;n#Segment_For_Wordpress#0;n#!!top" /> 77 74 <element signature="n#define_admin_hooks#0;n#Segment_For_Wordpress#0;n#!!top" /> 78 <element signature="e#41339#41896#0#PHP" />79 75 <element signature="n#check_trackable_user#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 80 76 <element signature="n#check_trackable_post#0;n#Segment_Analytics_WordPress#0;n#!!top" /> … … 83 79 <element signature="n#viewed_product#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 84 80 <element signature="n#product_added#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 85 <element signature="e#51707#51775#0#PHP" />86 81 <element signature="n#product_removed#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 87 82 <element signature="n#product_readded#0;n#Segment_Analytics_WordPress#0;n#!!top" /> … … 94 89 <element signature="n#order_cancelled#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 95 90 <element signature="n#coupon_added#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 96 <element signature=" n#get_current_page_track#0;n#Segment_Analytics_WordPress#0;n#!!top" />97 <element signature="e#838 73#84247#0#PHP" />91 <element signature="e#66318#66492#0#PHP" /> 92 <element signature="e#83844#84218#0#PHP" /> 98 93 <element signature="n#get_current_page#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 99 <element signature="e#846 59#84918#0#PHP" />94 <element signature="e#84630#84889#0#PHP" /> 100 95 <element signature="n#esc_js_deep#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 96 <element signature="e#84940#85275#0#PHP" /> 101 97 <element signature="n#get_user_id_from_order#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 102 <element signature="e#85521#85728#0#PHP" /> 103 <element signature="e#85606#85728#0#PHP" /> 104 <element signature="e#85731#85780#0#PHP" /> 98 <element signature="e#85781#85864#0#PHP" /> 99 <element signature="e#85917#85971#0#PHP" /> 100 <element signature="e#85974#86142#0#PHP" /> 101 <element signature="e#86022#86111#0#PHP" /> 102 <element signature="e#86116#86142#0#PHP" /> 105 103 </folding> 106 104 </state> … … 108 106 </entry> 109 107 </file> 110 <file pinned="false" current-in-tab=" false">108 <file pinned="false" current-in-tab="true"> 111 109 <entry file="file://$PROJECT_DIR$/trunk/README.txt"> 112 110 <provider selected="true" editor-type-id="text-editor"> 113 <state relative-caret-position=" 475">114 <caret line=" 56" column="36" selection-start-line="56" selection-start-column="36" selection-end-line="56" selection-end-column="36" />111 <state relative-caret-position="195"> 112 <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" /> 115 113 </state> 116 114 </provider> … … 132 130 <find>order</find> 133 131 <find>_order</find> 132 <find>identify</find> 133 <find>product</find> 134 <find>ninja</find> 135 <find>wc_</find> 136 <find>wc_get</find> 134 137 </findStrings> 138 <dirStrings> 139 <dir>$PROJECT_DIR$</dir> 140 </dirStrings> 135 141 </component> 136 142 <component name="IdeDocumentHistory"> 137 143 <option name="CHANGED_PATHS"> 138 144 <list> 145 <option value="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-identify.php" /> 146 <option value="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-track.php" /> 139 147 <option value="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress.php" /> 140 <option value="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-track.php" /> 141 <option value="$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-identify.php" /> 148 <option value="$PROJECT_DIR$/trunk/segment-for-wordpress.php" /> 142 149 <option value="$PROJECT_DIR$/trunk/README.txt" /> 143 <option value="$PROJECT_DIR$/trunk/segment-for-wordpress.php" />144 150 </list> 145 151 </option> 146 152 </component> 147 <component name="ProjectFrameBounds"> 153 <component name="ProjectFrameBounds" extendedState="6"> 154 <option name="x" value="720" /> 148 155 <option name="y" value="23" /> 149 <option name="width" value=" 1440" />156 <option name="width" value="720" /> 150 157 <option name="height" value="877" /> 151 158 </component> … … 155 162 </navigator> 156 163 <panes> 157 <pane id="Scope" />158 164 <pane id="ProjectPane"> 159 165 <subPane> … … 168 174 <item name="trunk" type="462c0819:PsiDirectoryNode" /> 169 175 </path> 170 <path>171 <item name="segment-for-wp-by-in8-io" type="b2602c69:ProjectViewProjectNode" />172 <item name="segment-for-wp-by-in8-io" type="462c0819:PsiDirectoryNode" />173 <item name="trunk" type="462c0819:PsiDirectoryNode" />174 <item name="includes" type="462c0819:PsiDirectoryNode" />175 </path>176 176 </expand> 177 177 <select /> 178 178 </subPane> 179 179 </pane> 180 <pane id="Scope" /> 180 181 </panes> 181 182 </component> … … 200 201 </component> 201 202 <component name="SvnConfiguration" cleanupOnStartRun="true"> 202 <configuration>$ USER_HOME$/.subversion</configuration>203 <configuration>$PROJECT_DIR$/../.subversion</configuration> 203 204 <supportedVersion>125</supportedVersion> 204 205 </component> … … 232 233 <workItem from="1560860871322" duration="182000" /> 233 234 <workItem from="1560868280298" duration="2123000" /> 234 <workItem from="1560985937734" duration="2287000" /> 235 <workItem from="1560985937734" duration="6565000" /> 236 <workItem from="1560997751889" duration="1039000" /> 235 237 </task> 236 238 <servers /> 237 239 </component> 238 240 <component name="TimeTrackingManager"> 239 <option name="totallyTimeSpent" value=" 4945000" />241 <option name="totallyTimeSpent" value="10262000" /> 240 242 </component> 241 243 <component name="ToolWindowManager"> 242 <frame x="0" y="23" width="1440" height="877" extended-state=" 0" />244 <frame x="0" y="23" width="1440" height="877" extended-state="6" /> 243 245 <editor active="true" /> 244 246 <layout> 245 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2 8040057" />247 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2761087" /> 246 248 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 247 249 <window_info id="Favorites" order="2" side_tool="true" /> … … 268 270 </component> 269 271 <component name="WordPressConfiguration" doNotAskConfigAgain="true" enabled="true"> 270 <wordpressPath>$ USER_HOME$/Desktop/wordpress</wordpressPath>272 <wordpressPath>$PROJECT_DIR$/../Desktop/wordpress</wordpressPath> 271 273 </component> 272 274 <component name="editorHistoryManager"> … … 280 282 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-track.php"> 281 283 <provider selected="true" editor-type-id="text-editor"> 282 <state relative-caret-position="469"> 283 <caret line="74" selection-start-line="74" selection-end-line="76" selection-end-column="44" /> 284 <state relative-caret-position="315"> 285 <caret line="21" column="34" lean-forward="true" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="34" /> 286 </state> 287 </provider> 288 </entry> 289 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-identify.php"> 290 <provider selected="true" editor-type-id="text-editor"> 291 <state relative-caret-position="279"> 292 <caret line="99" column="38" selection-end-line="171" selection-end-column="61" /> 293 <folding> 294 <element signature="e#1873#1941#0#PHP" /> 295 </folding> 296 </state> 297 </provider> 298 </entry> 299 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-http-track.php"> 300 <provider selected="true" editor-type-id="text-editor"> 301 <state relative-caret-position="45"> 302 <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" /> 284 303 </state> 285 304 </provider> … … 287 306 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress.php"> 288 307 <provider selected="true" editor-type-id="text-editor"> 289 <state relative-caret-position=" 180">290 <caret line=" 722" column="70" selection-start-line="722" selection-start-column="70" selection-end-line="722" selection-end-column="70" />308 <state relative-caret-position="22365"> 309 <caret line="2118" lean-forward="true" selection-start-line="2118" selection-end-line="2118" /> 291 310 <folding> 292 311 <element signature="e#7#340#0#PHP" expanded="true" /> 293 312 <element signature="n#load_dependencies#0;n#Segment_For_Wordpress#0;n#!!top" /> 294 313 <element signature="n#define_admin_hooks#0;n#Segment_For_Wordpress#0;n#!!top" /> 295 <element signature="e#41339#41896#0#PHP" />296 314 <element signature="n#check_trackable_user#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 297 315 <element signature="n#check_trackable_post#0;n#Segment_Analytics_WordPress#0;n#!!top" /> … … 300 318 <element signature="n#viewed_product#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 301 319 <element signature="n#product_added#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 302 <element signature="e#51707#51775#0#PHP" />303 320 <element signature="n#product_removed#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 304 321 <element signature="n#product_readded#0;n#Segment_Analytics_WordPress#0;n#!!top" /> … … 311 328 <element signature="n#order_cancelled#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 312 329 <element signature="n#coupon_added#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 313 <element signature=" n#get_current_page_track#0;n#Segment_Analytics_WordPress#0;n#!!top" />314 <element signature="e#838 73#84247#0#PHP" />330 <element signature="e#66318#66492#0#PHP" /> 331 <element signature="e#83844#84218#0#PHP" /> 315 332 <element signature="n#get_current_page#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 316 <element signature="e#846 59#84918#0#PHP" />333 <element signature="e#84630#84889#0#PHP" /> 317 334 <element signature="n#esc_js_deep#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 335 <element signature="e#84940#85275#0#PHP" /> 318 336 <element signature="n#get_user_id_from_order#0;n#Segment_Analytics_WordPress#0;n#!!top" /> 319 <element signature="e#85521#85728#0#PHP" /> 320 <element signature="e#85606#85728#0#PHP" /> 321 <element signature="e#85731#85780#0#PHP" /> 337 <element signature="e#85781#85864#0#PHP" /> 338 <element signature="e#85917#85971#0#PHP" /> 339 <element signature="e#85974#86142#0#PHP" /> 340 <element signature="e#86022#86111#0#PHP" /> 341 <element signature="e#86116#86142#0#PHP" /> 322 342 </folding> 323 </state>324 </provider>325 </entry>326 <entry file="file://$PROJECT_DIR$/trunk/README.txt">327 <provider selected="true" editor-type-id="text-editor">328 <state relative-caret-position="475">329 <caret line="56" column="36" selection-start-line="56" selection-start-column="36" selection-end-line="56" selection-end-column="36" />330 343 </state> 331 344 </provider> … … 336 349 <caret line="20" column="3" lean-forward="true" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" /> 337 350 <folding> 338 <element signature="e#7#74 0#0#PHP" expanded="true" />351 <element signature="e#7#741#0#PHP" expanded="true" /> 339 352 </folding> 340 353 </state> 341 354 </provider> 342 355 </entry> 343 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-http-track.php"> 344 <provider selected="true" editor-type-id="text-editor"> 345 <state relative-caret-position="-743"> 346 <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" /> 347 </state> 348 </provider> 349 </entry> 350 <entry file="file://$PROJECT_DIR$/trunk/includes/class-segment-for-wordpress-identify.php"> 351 <provider selected="true" editor-type-id="text-editor"> 352 <state relative-caret-position="423"> 353 <caret line="39" column="47" lean-forward="true" selection-start-line="39" selection-start-column="47" selection-end-line="39" selection-end-column="47" /> 354 <folding> 355 <element signature="n#add_user_traits#0;n#!!top" /> 356 <element signature="e#1873#1941#0#PHP" /> 357 <element signature="e#1943#6440#0#PHP" /> 358 </folding> 356 <entry file="file://$PROJECT_DIR$/trunk/README.txt"> 357 <provider selected="true" editor-type-id="text-editor"> 358 <state relative-caret-position="195"> 359 <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" /> 359 360 </state> 360 361 </provider> -
segment-for-wp-by-in8-io/trunk/README.txt
r2109173 r2109215 54 54 == Changelog == 55 55 56 = 1.0.9 = 57 * More updates to bring woocommerce integration inline with their 'new' functions vs legacy ones I used to begin with 58 56 59 = 1.0.8 = 57 60 * Moving to new WooCommerce methods to get order data in order to avoid some error notices -
segment-for-wp-by-in8-io/trunk/includes/class-segment-for-wordpress-track.php
r2109173 r2109215 75 75 $order_id = $properties['order_id']; 76 76 $user_id = Segment_Analytics_WordPress::get_user_id_from_order($order_id ); 77 77 78 $track['userId'] = $user_id; 78 79 } … … 123 124 $properties = json_decode( $properties, true ); 124 125 $order_id = $properties['order_id']; 125 126 126 $user_id = Segment_Analytics_WordPress::get_user_id_from_order($order_id ); 127 127 $track['userId'] = $user_id; -
segment-for-wp-by-in8-io/trunk/includes/class-segment-for-wordpress.php
r2109173 r2109215 2015 2015 ); 2016 2016 $order_id = $properties['order_id']; 2017 $_order = wc_get_order( $order_id ); 2018 $order_email = $_order->billing_email; 2019 // check if there are any users with the billing email as user or email 2020 $email = email_exists( $order_email ); 2021 $user = username_exists( $order_email ); 2022 $user = get_user_by( 'email', $order_email ); 2023 $user_id = $user->ID; 2017 $user_id = Segment_Analytics_WordPress::get_user_id_from_order($order_id ); 2024 2018 $track[ $i ]['userId'] = $user_id; 2025 2019 $i ++; … … 2040 2034 ); 2041 2035 $order_id = $properties['order_id']; 2042 $_order = wc_get_order( $order_id ); 2043 $order_email = $_order->billing_email; 2044 // check if there are any users with the billing email as user or email 2045 $email = email_exists( $order_email ); 2046 $user = username_exists( $order_email ); 2047 $user = get_user_by( 'email', $order_email ); 2048 $user_id = $user->ID; 2036 $order_id = $properties['order_id']; 2037 $user_id = Segment_Analytics_WordPress::get_user_id_from_order($order_id ); 2049 2038 $track[ $i ]['userId'] = $user_id; 2050 2039 $i ++; … … 2065 2054 ); 2066 2055 $order_id = $properties['order_id']; 2067 $_order = wc_get_order( $order_id ); 2068 $order_email = $_order->billing_email; 2069 // check if there are any users with the billing email as user or email 2070 $email = email_exists( $order_email ); 2071 $user = username_exists( $order_email ); 2072 $user = get_user_by( 'email', $order_email ); 2073 $user_id = $user->ID; 2056 $user_id = Segment_Analytics_WordPress::get_user_id_from_order($order_id ); 2074 2057 $track[ $i ]['userId'] = $user_id; 2075 2058 $i ++; … … 2090 2073 ); 2091 2074 $order_id = $properties['order_id']; 2092 $_order = wc_get_order( $order_id ); 2093 $order_email = $_order->billing_email; 2094 // check if there are any users with the billing email as user or email 2095 $email = email_exists( $order_email ); 2096 $user = username_exists( $order_email ); 2097 $user = get_user_by( 'email', $order_email ); 2098 $user_id = $user->ID; 2075 $user_id = Segment_Analytics_WordPress::get_user_id_from_order($order_id ); 2099 2076 $track[ $i ]['userId'] = $user_id; 2100 2077 $i ++; … … 2115 2092 ); 2116 2093 $order_id = $properties['order_id']; 2117 $_order = wc_get_order( $order_id ); 2118 $order_email = $_order->billing_email; 2119 // check if there are any users with the billing email as user or email 2120 $email = email_exists( $order_email ); 2121 $user = username_exists( $order_email ); 2122 $user = get_user_by( 'email', $order_email ); 2123 $user_id = $user->ID; 2094 $user_id = Segment_Analytics_WordPress::get_user_id_from_order($order_id ); 2124 2095 $track[ $i ]['userId'] = $user_id; 2125 2096 $i ++; … … 2214 2185 } 2215 2186 2187 /** 2188 * Turns objects to arrays 2189 * 2190 * @param null $obj 2191 * 2192 * @return array 2193 */ 2194 public static function object_to_array( $obj ) { 2195 if ( is_object( $obj ) ) { 2196 $obj = (array) $obj; 2197 } 2198 if ( is_array( $obj ) ) { 2199 $new = array(); 2200 foreach ( $obj as $key => $val ) { 2201 $new[ $key ] = self::object_to_array( $val ); 2202 } 2203 } else { 2204 $new = $obj; 2205 } 2206 2207 return $new; 2208 } 2209 2216 2210 } 2217 2211 -
segment-for-wp-by-in8-io/trunk/segment-for-wordpress.php
r2109173 r2109215 12 12 * Plugin URI: https://in8.io 13 13 * Description: Re-wrote and extended the Segment Analytics plugin. The official one has been dead for a couple of years, which is a shame. Hope you find this useful! Added several extra features. 14 * Version: 1.0. 814 * Version: 1.0.9 15 15 * Author: Juan 16 16 * Author URI: https://juangonzalez.com.au
Note: See TracChangeset
for help on using the changeset viewer.