@@ -2,7 +2,7 @@ const errorHandling = require('../store-api/error-handling')
22const Tiny = require ( '../tiny/constructor' )
33const parseOrder = require ( './parsers/order-to-tiny/' )
44const parseStatus = require ( './parsers/order-to-tiny/status' )
5- const selectTypeUpdate = require ( './helpers/select-type -update' )
5+ const getOrderUpdateType = require ( './helpers/get-order -update-type ' )
66const handleJob = require ( './handle-job' )
77
88module . exports = ( { appSdk, storeId, auth } , tinyToken , queueEntry , appData , canCreateNew ) => {
@@ -17,38 +17,16 @@ module.exports = ({ appSdk, storeId, auth }, tinyToken, queueEntry, appData, can
1717 }
1818 const tiny = new Tiny ( tinyToken )
1919 console . log ( `#${ storeId } ${ orderId } searching order ${ order . number } ` )
20- const findLatestUpdate = order => {
21- const fulfillments = order . fulfillments
22- const paymentsHistory = order . payments_history
23- let latestFulfillment , latestPayment
24- if ( Array . isArray ( fulfillments ) ) {
25- latestFulfillment = fulfillments . reduce ( ( a , b ) => ( a . date_time > b . date_time ? a : b ) )
26- }
27- if ( Array . isArray ( paymentsHistory ) ) {
28- latestPayment = paymentsHistory . reduce ( ( a , b ) => ( a . date_time > b . date_time ? a : b ) )
29- }
30- if ( latestFulfillment && latestPayment ) {
31- return latestFulfillment . date_time > latestPayment . date_time ? latestFulfillment : latestPayment
32- } else if ( latestFulfillment && ! latestPayment ) {
33- return latestFulfillment
34- } else if ( ! latestFulfillment && latestPayment ) {
35- return latestPayment
36- }
37- }
38- const latestUpdateStatus = findLatestUpdate ( order )
39- if ( selectTypeUpdate ( latestStatusUpdate ) === 'fulfillment' ) {
40- const checkFulfillmentFromTiny = order => {
41- const fulfillmentStatus = order . fulfillment_status && order . fulfillment_status . current
42- if ( fulfillmentStatus && Array . isArray ( order . fulfillments ) ) {
43- return Boolean ( order . fulfillments . find ( ( { status, flags } ) => {
44- return status === fulfillmentStatus && flags && flags . includes ( 'from-tiny' )
45- } ) )
20+ if ( getOrderUpdateType ( order ) === 'fulfillment' ) {
21+ const fulfillmentStatus = order . fulfillment_status && order . fulfillment_status . current
22+ if ( fulfillmentStatus && Array . isArray ( order . fulfillments ) ) {
23+ const fulfillmentFromTiny = order . fulfillments . find ( ( { status, flags } ) => {
24+ return status === fulfillmentStatus && flags && flags . includes ( 'from-tiny' )
25+ } )
26+ if ( fulfillmentFromTiny ) {
27+ console . log ( `#${ storeId } ${ orderId } skipped to not send status came by tiny` )
28+ return null
4629 }
47- return false
48- }
49- if ( checkFulfillmentFromTiny ( order ) ) {
50- console . log ( `#${ storeId } ${ orderId } skipped to not send status came by tiny` )
51- return null
5230 }
5331 }
5432
0 commit comments